- rel 3; fix bug 6269

Changed files:
    spamassassin-bug-6269.patch -> 1.1
    spamassassin.spec -> 1.147

diff --git a/spamassassin-bug-6269.patch b/spamassassin-bug-6269.patch
new file mode 100644 (file)
index 0000000..932df70
--- /dev/null
+++ b/spamassassin-bug-6269.patch
@@ -0,0 +1,11 @@
+--- Mail-SpamAssassin-3.2.5/rules/72_active.cf~        2008-06-10 11:21:33.000000000 +0200
++++ Mail-SpamAssassin-3.2.5/rules/72_active.cf 2010-01-01 22:23:05.805159034 +0100
+@@ -540,7 +540,7 @@
+ ##} FH_DATE_IS_19XX
+ 
+ ##{ FH_DATE_PAST_20XX
+-header   FH_DATE_PAST_20XX    Date =~ /20[1-9][0-9]/ [if-unset: 2006]
++header   FH_DATE_PAST_20XX    Date =~ /20[2-9][0-9]/ [if-unset: 2006]
+ describe FH_DATE_PAST_20XX    The date is grossly in the future.
+ ##} FH_DATE_PAST_20XX
+ 

diff --git a/spamassassin.spec b/spamassassin.spec
index b03d5dbedcfca56d2f0692c9896100f8d4bada17..f57302bc9dab6f7b122b74baa6d1963d724bce23 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -12,7 +12,7 @@ Summary:      A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
 Version:       3.2.5
-Release:       2
+Release:       3
 License:       Apache v2.0
 Group:         Applications/Mail
 Source0:       http://www.apache.net.pl/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
@@ -23,6 +23,7 @@ Source3:      %{name}-default.rc
 Source4:       %{name}-spamc.rc
 Source5:       sa-update.sh
 Source6:       sa-update.cron
+Patch0:                %{name}-bug-6269.patch
 URL:           http://spamassassin.apache.org/
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.16
@@ -36,7 +37,7 @@ BuildRequires:        perl-IO-Socket-SSL
 BuildRequires: perl-IO-Zlib
 BuildRequires: perl-IP-Country
 BuildRequires: perl-Mail-SPF-Query
-BuildRequires: perl-Net-DNS
+BuildRequires: perl-Net-DNS >= 0.34
 BuildRequires: perl-Net-Ident
 #BuildRequires:        perl-Razor2
 BuildRequires: perl-devel >= 1:5.8.0
@@ -251,6 +252,7 @@ aplikacji do czytania poczty.
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
+%patch0 -p1
 
 %build
 # for spamc/configure