diff --git a/spamassassin.spec b/spamassassin.spec index e4b4ee5..b48f511 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,6 +1,12 @@ -%define real_name Mail-SpamAssassin -%define krb5backcompat %([ -a /usr/kerberos/include/krb5.h ] && echo 1 || echo 0) +# OPTION: SSL and IPv6 (FC6+, RHEL5+) +%define option_ssl 1 +# OPTION: perl-Archive-Tar (FC2+, RHEL5+) +%define option_archive_tar 1 +# DEPRECATED OPTION: Old krb5.h location (RHEL3 and old FC) +%define option_old_krb5 0 + +%define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} Summary: Spam filter for email which can be invoked from mail delivery agents. @@ -39,12 +45,17 @@ BuildRequires: openssl-devel Requires: perl(Net::DNS) Requires: perl(Time::HiRes) Requires: perl(DB_File) -Requires: perl(Archive::Tar) Requires: procmail + +%if %{option_archive_tar} +Requires: perl(Archive::Tar) +%endif +%if %{option_ssl} # Needed for spamc/spamd SSL Requires: perl(IO::Socket::SSL) # Needed for IPv6 Requires: perl(IO::Socket::INET6) +%endif Obsoletes: perl-Mail-SpamAssassin @@ -77,7 +88,7 @@ To filter spam for all users, add that line to /etc/procmailrc export CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null -%{__make} %{?krb5backcompat:SSLCFLAGS=-DSPAMC_SSL\ -I/usr/kerberos/include} OPTIMIZE="$RPM_OPT_FLAGS" +%{__make} %{?option_old_krb5:SSLCFLAGS=-DSPAMC_SSL\ -I/usr/kerberos/include} OPTIMIZE="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -172,6 +183,14 @@ fi exit 0 %changelog +* Thu Jan 18 2007 Warren Togami +- Options for RHEL4 + * spamc/spamd cannot connect over IPv6 or SSL + * sa-update is disabled + The above functionality requires perl modules not included in RHEL4. + You may still use them if you get those perl modules from elsewhere. + RHEL5 ships these perl modules. + * Thu Dec 14 2006 Warren Togami - 3.1.7-4 - add standardized sa-update cron script, disabled by default