From bd151683bf2e8f66336f3c321599b8dbebedde4c Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 12:39:30 +0000
Subject: [PATCH] auto-import changelog data from
 spamassassin-3.0-0.0.svn20040530.src.rpm Mon May 31 2004 Warren Togami
 <wtogami@redhat.com> - 3.0-svn20040530 - svn snapshot 20040530 - #124870
 prevent service startup failure due to old -a option - #124871 more docs -
 #124872 unowned directories

---
 .cvsignore             |  2 +-
 sources                |  2 +-
 spamassassin.spec      | 25 +++++++++++++++++++++----
 spamassassin.sysconfig |  2 +-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a068371..6cce6d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Mail-SpamAssassin-3.0-svn20040524.tar.bz2
+Mail-SpamAssassin-3.0-svn20040530.tar.bz2
diff --git a/sources b/sources
index af5aa13..f9bb3bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ff9b8c010714a55f5b808ad49d9347b  Mail-SpamAssassin-3.0-svn20040524.tar.bz2
+157608b487ec5d73494dad371f101683  Mail-SpamAssassin-3.0-svn20040530.tar.bz2
diff --git a/spamassassin.spec b/spamassassin.spec
index f76a064..dc83ab3 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -4,16 +4,18 @@
 %define real_name Mail-SpamAssassin
 %define krb5backcompat %([ -a /usr/kerberos/include/krb5.h ] && echo 1 || echo 0)
 
+%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: %{name}
 Version: 3.0
-Release: 0.0.svn20040524
+Release: 0.0.svn20040530
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.org/
 # Subversion Snapshot
 # http://wiki.apache.org/spamassassin/DownloadFromSvn
-Source0: Mail-SpamAssassin-3.0-svn20040524.tar.bz2
+Source0: Mail-SpamAssassin-3.0-svn20040530.tar.bz2
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -27,6 +29,7 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: %{_prefix}
 Requires: /sbin/chkconfig /sbin/service
+ExcludeArch: ppc64
 
 BuildRequires: perl-Net-DNS
 BuildRequires: perl >= 2:5.8.0
@@ -103,6 +106,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress
 
 find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
@@ -112,11 +116,13 @@ if [ "$(cat %{name}-%{version}-filelist)X" = "X" ] ; then
     echo "ERROR: EMPTY FILE LIST"
     exit -1
 fi
+find $RPM_BUILD_ROOT%{perl_vendorlib}/* -type d -print |
+        sed "s@^$RPM_BUILD_ROOT@%dir @g" >> %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-%doc README Changes sample-nonspam.txt sample-spam.txt
-%doc LICENSE
+%doc BUGS COPYRIGHT CREDITS Changes LICENSE README STATUS TRADEMARK UPGRADE
+%doc USAGE sample-nonspam.txt sample-spam.txt
 %config(noreplace) %{_initrddir}/spamassassin
 %config(noreplace) %{_sysconfdir}/mail/spamassassin
 %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin
@@ -127,6 +133,11 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add spamassassin
 
+# -a and --auto-whitelist options were removed from 3.0.0
+# prevent service startup failure
+perl -p -i -e 's/(["\s]-\w+)a/$1/ ; s/(["\s]-)a(\w+)/$1$2/ ; s/(["\s])-a\b/$1/' /etc/sysconfig/spamassassin
+perl -p -i -e 's/ --auto-whitelist//' /etc/sysconfig/spamassassin
+
 if [ -f /etc/spamassassin.cf ]; then
 	%{__mv} /etc/spamassassin.cf /etc/mail/spamassassin/migrated.cf
 fi
@@ -147,6 +158,12 @@ fi
 exit 0
 
 %changelog
+* Mon May 31 2004 Warren Togami <wtogami@redhat.com> - 3.0-svn20040530
+- svn snapshot 20040530
+- #124870 prevent service startup failure due to old -a option
+- #124871 more docs
+- #124872 unowned directories
+
 * Tue May 24 2004 Warren Togami <wtogami@redhat.com> - 3.0-svn20040524
 - #123432 do not start service by default
 - #122488 remove CRLF's
diff --git a/spamassassin.sysconfig b/spamassassin.sysconfig
index 52c1552..70b21ed 100644
--- a/spamassassin.sysconfig
+++ b/spamassassin.sysconfig
@@ -1,2 +1,2 @@
 # Options to spamd
-SPAMDOPTIONS="-d -c -a -m5 -H"
+SPAMDOPTIONS="-d -c -m5 -H"