packages: spamassassin/spamassassin.spec - bugfix for SA#6269 too evil for ...

[glen]

Author: glen                         Date: Tue Jan  5 22:20:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- bugfix for SA#6269 too evil for ac?
- adapter

---- Files affected:
packages/spamassassin:
   spamassassin.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: packages/spamassassin/spamassassin.spec
diff -u packages/spamassassin/spamassassin.spec:1.150 packages/spamassassin/spamassassin.spec:1.151
--- packages/spamassassin/spamassassin.spec:1.150	Tue Jan  5 16:42:13 2010
+++ packages/spamassassin/spamassassin.spec	Tue Jan  5 23:20:16 2010
@@ -46,9 +46,12 @@
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	perl-libwww
 BuildRequires:	re2c
-BuildRequires:	rpmbuild(macros) >= 1.310
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpm-perlprov >= 4.1-13
+BuildRequires:	rpmbuild(macros) >= 1.453
 %if %{with tests}
 # are these really needed?
+BuildRequires:	perl-Compress-Zlib
 BuildRequires:	perl-Encode-Detect
 BuildRequires:	perl-MIME-Base64
 BuildRequires:	perl-MIME-tools
@@ -57,9 +60,7 @@
 BuildRequires:	perl-Mail-SPF
 BuildRequires:	perl-MailTools
 BuildRequires:	perl-Razor > 2.61
-BuildRequires:	perl-Compress-Zlib
 %endif
-BuildRequires:	rpm-perlprov >= 4.1-13
 Requires:	perl-Mail-SpamAssassin = %{version}-%{release}
 Obsoletes:	SpamAssassin
 Obsoletes:	spamassassin-tools
@@ -68,15 +69,15 @@
 %define		_noautoreq	'perl(Razor2::Client::Agent)' 'perl(Razor::Agent)' 'perl(Razor::Client)' 'perl(DBI)' 'perl(Net::Ident)'
 
 %description
-Apache SpamAssassin provides you with a way to reduce if not completely
-eliminate Unsolicited Commercial Email (SPAM) from your incoming
-email. It can be invoked by a MDA such as sendmail or postfix, or can
-be called from a procmail script, .forward file, etc. It uses a
-genetic-algorithm evolved scoring system to identify messages which
-look spammy, then adds headers to the message so they can be filtered
-by the user's mail reading software. This distribution includes the
-spamd/spamc components which create a server that considerably speeds
-processing of mail.
+Apache SpamAssassin provides you with a way to reduce if not
+completely eliminate Unsolicited Commercial Email (SPAM) from your
+incoming email. It can be invoked by a MDA such as sendmail or
+postfix, or can be called from a procmail script, .forward file, etc.
+It uses a genetic-algorithm evolved scoring system to identify
+messages which look spammy, then adds headers to the message so they
+can be filtered by the user's mail reading software. This distribution
+includes the spamd/spamc components which create a server that
+considerably speeds processing of mail.
 
 To enable spamassassin, if you are receiving mail locally, simply add
 this line to your ~/.procmailrc:
@@ -221,6 +222,7 @@
 Requires:	perl-HTML-Parser >= 3
 # what for this one?
 #Requires:	perl-Sys-Hostname-Long
+Suggests:	Razor
 Suggests:	perl-Cache-DB_File >= 0.2
 Suggests:	perl-DBD-mysql
 Suggests:	perl-Encode-Detect
@@ -231,7 +233,6 @@
 #Suggests:	perl-Mail-SPF
 Suggests:	perl-Mail-SPF-Query
 Suggests:	perl-Net-DNS >= 0.34
-Suggests:	Razor
 Suggests:	spamassassin-compile
 Suggests:	spamassassin-plugin-fuzzyocr
 Suggests:	spamassassin-update
@@ -257,7 +258,9 @@
 %setup -q -n %{pdir}-%{pnam}-%{version}
 dos2unix rules/72_active.cf
 %patch0 -p1
+%if "%{pld_release}" != "ac"
 %patch1 -p1
+%endif
 
 %build
 # for spamc/configure
@@ -413,6 +416,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2010/01/05 22:20:16  glen
+- bugfix for SA#6269 too evil for ac?
+- adapter
+
 Revision 1.150  2010/01/05 15:42:13  glen
 - bugfix for SA#6131; rel 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spamassassin/spamassassin.spec?r1=1.150&r2=1.151&f=u