From 5ebd7deb39e05c884eb257a1bc8991d7e7183c10 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: May 25 2017 16:19:25 +0000 Subject: Conditionalize the cassandane stuff. To facilitate building for EL7 and maybe F25 and older, conditionalize the build dependencies and calls to Cassandane. --- diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index c033fb9..fbc9eff 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -2,6 +2,9 @@ %global cmt1 b97ba9cbe78e48d10ee0cbdb1f43a73b907e3460 %define scmt(l:) %(c=%1; echo ${c:0:%{-l:%{-l*}}%{!-l:7}}) +# Cassandane run by default. '--without cassandane' disables. +%bcond_without cassandane + Name: cyrus-imapd Version: 3.0.1 Release: 1%{?dist} @@ -84,6 +87,7 @@ BuildRequires: cyrus-sasl-plain cyrus-sasl-md5 BuildRequires: net-tools words #BuildRequires: imaptest +%if %{with cassandane} # Perl modules required for cassandane to function BuildRequires: perl(AnyEvent) perl(BSD::Resource) perl(Clone) BuildRequires: perl(File::chdir) perl(IO::Socket::INET6) perl(Mail::IMAPTalk) @@ -92,6 +96,7 @@ BuildRequires: perl(Net::CalDAVTalk) perl(Net::CardDAVTalk) BuildRequires: perl(Net::Server) perl(News::NNTPClient) perl(String::CRC32) BuildRequires: perl(Sys::Syslog) perl(Test::Unit::TestRunner) perl(Time::HiRes) BuildRequires: perl(Unix::Syslog) perl(XML::DOM) perl(XML::Generator) +%endif Requires(pre): shadow-utils Requires(post): /sbin/ldconfig @@ -207,9 +212,11 @@ popd # This is the test suite, which doesn't build much but does verify its dependencies. # If this is done after the configure call, the one thing it does build fails # because the configure macro puts some hardening flags into the environment. +%if %{with cassandane} pushd cassandane make popd +%endif # Options not enabled: # --enable-objectstore @@ -398,6 +405,7 @@ find %buildroot -name ".packlist" -exec rm {} \; %check make %{?_smp_mflags} check || exit 1 +%if %{with cassandane} pushd cassandane # Build the syslog interposer @@ -448,6 +456,7 @@ export LD_LIBRARY_PATH=%buildroot/%_libdir # current UID to Cassandane::AnnotatorDaemon->run. # (getpwuid($<))[0] # Also override group +%endif %pre