spamassassin-3.3.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3346 ec354946-7b23-47d6-9f5a-488ba84defc7

s/spamassassin/spamassassin-vl.spec

@@ -2,15 +2,15 @@
 %define pdir    Mail
 %define pnam    SpamAssassin
 
-%define version 3.2.5
-%define real_version 3.2.5
+%define version 3.3.1
+%define real_version 3.3.1
 %define release 1%{_dist_release}
-%define cfdate 20080224
+%define cfdate 20110406
 %define name spamassassin
 %define _initrddir /etc/rc.d/init.d/
 %define initdir %{_initrddir}
-%define __find_provides /usr/lib/rpm/find-provides.perl
-%define __find_requires /usr/lib/rpm/find-requires.perl
+#%define __find_provides /usr/lib/rpm/find-provides.perl
+#%define __find_requires /usr/lib/rpm/find-requires.perl
 
 Summary: a spam filter for email which can be invoked from mail delivery agents
 Summary(ja): MDA から起動できる spam email filter
@@ -28,19 +28,22 @@ Source4: sa-update.cronscript
 Source5: sa-update.crontab
 Source6: sa-update.logrotate
 Patch0: spamassassin-3.1.7_rules.patch
+Patch1: spamassassin-3.3.1-fix-deprecated.patch
+Patch2: spamassassin-3.3.1-fix-deprecated2.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-Prereq: /sbin/chkconfig
-Prereq: perl-Mail-SpamAssassin = %{version}-%{release}
-Prereq: spamassassin-tools = %{version}-%{release}
+Requires(pre): /sbin/chkconfig
+Requires(pre): perl-Mail-SpamAssassin = %{version}-%{release}
+Requires(pre): spamassassin-tools = %{version}-%{release}
 Requires: perl >= 1:5.10.0
 Requires: perl(Pod::Usage), perl(HTML::Parser) >= 3.43 perl(Digest::SHA1)
 Requires: perl(Net::DNS)
 # sa-update's Requires
 Requires: perl(Archive::Tar) >= 1.23 perl(IO::Zlib) >= 1.04 perl(LWP) 
 
-BuildPrereq: perl >= 1:5.10.0 perl(HTML::Parser) >= 3.43 perl(Digest::SHA1)
-BuildPrereq: perl(Archive::Tar) >= 1.23 perl(IO::Zlib) >= 1.04
-BuildPrereq: perl(Net::DNS)
+BuildRequires: perl >= 1:5.10.0 perl(HTML::Parser) >= 3.43 perl(Digest::SHA1)
+BuildRequires: perl(Archive::Tar) >= 1.23 perl(IO::Zlib) >= 1.04
+BuildRequires: perl(Net::DNS)
+BuildRequires: perl(NetAddr::IP)
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -76,7 +79,7 @@ SpamAssassin は、スパムメッセージを識別するために遺伝的ア
 Summary: Miscellaneous tools for SpamAssassin
 Summary(ja): SpamAssassin 向けの各種ツール
 Group: Applications/Internet
-Prereq: perl-Mail-SpamAssassin = %{version}-%{release}
+Requires(pre): perl-Mail-SpamAssassin = %{version}-%{release}
 Requires: perl >= 1:5.6.1
 Autoreq: no
 
@@ -103,6 +106,9 @@ user's own mail user-agent application.
 
 %patch0 -p0 -b .rules
 
+%patch1 -p0 -b .fix-deprecated
+%patch2 -p0 -b .fix-deprecated2
+
 # Japanese sample file / README
 cp -p %{SOURCE1} sample-japanese-local.cf
 cp -p %{SOURCE2} README.vine
@@ -141,6 +147,11 @@ mkdir -p $RPM_BUILD_ROOT/var/spool/spamassassin
 #         /sbin/chkconfig --add spamassassin
 # fi
 
+if [ -x /usr/bin/sa-update ] ; then
+echo "Update rules"
+/usr/bin/sa-update ||:
+fi
+
 # update
 if [ $1 = 2 ]; then
     if [ -x /usr/bin/sa-learn ] ; then
@@ -157,6 +168,12 @@ if [ $1 = 2 ]; then
     fi
 fi
 
+%post -n perl-Mail-SpamAssassin
+if [ -x /usr/bin/sa-update ] ; then
+echo "Update rules"
+/usr/bin/sa-update ||:
+fi
+
 %pre -n perl-Mail-SpamAssassin
 # update
 if [ $1 = 2 ]; then
@@ -204,6 +221,12 @@ fi
 %attr(775,root,root) /var/spool/spamassassin
 
 %changelog
+* Fri Apr 08 2011 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3.1-1
+- new upstream release.
+- replaced "Prereq:" and "BuildPrereq".
+- updated sample-japanese-local.cf.
+- added Patch1 and Patch2 for perl-5.12.x.
+
 * Mon Jun 22 2009 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.2.5-1
 - new upstream release.
 - wrote spec in UTF-8.