From f708340813c6fd6fcac64365ab5f31fd015f28c6 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Sep 17 2009 18:05:19 +0000 Subject: F12+ requires Mail::DKIM --- diff --git a/spamassassin.spec b/spamassassin.spec index ae1c137..3f2f9f5 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -18,6 +18,7 @@ # Define variables to use in conditionals %define option_ssl 0 %define perl_devel 0 +%define dkim_deps 0 # SSL and IPv6 (FC6+, RHEL5+) %if 0%{?fedora} > 5 @@ -29,6 +30,11 @@ %define perl_devel 1 %endif +# Mail::DKIM by default (F12+) +%if 0%{?fedora} >= 12 +%define dkim_deps 1 +%endif + %define real_name Mail-SpamAssassin %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} @@ -36,7 +42,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 3.3.0 %define prename alpha2 -Release: 0.12.alpha2%{?dist} +Release: 0.13.alpha2%{?dist} License: ASL 2.0 Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -71,7 +77,6 @@ Requires: perl(LWP::UserAgent) Requires: perl(Net::DNS) Requires: perl(Time::HiRes) Requires: perl(DB_File) -Requires: perl(Mail::DKIM) Requires: procmail Requires: gnupg @@ -90,6 +95,12 @@ Requires: perl(IO::Socket::INET6) %if %{perl_devel} BuildRequires: perl-devel %endif +# Mail::DKIM for F12+, works from RHEL5+ from EPEL5 but we don't require them +%if %{dkim_deps} +Requires: perl(Mail::DKIM) +%endif + + Obsoletes: perl-Mail-SpamAssassin @@ -223,6 +234,9 @@ fi exit 0 %changelog +* Thu Sep 17 2009 Warren Togami - 3.3.0-0.13.alpha2 +- F12+ requires Mail::DKIM + * Sun Sep 13 2009 Warren Togami - 3.3.0-0.12.alpha2 - require perl(Mail::DKIM), useful due to USER_IN_DEF_DKIM_WL