From dd21159def794443b1b5af465237d15d7d35b116 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 12:37:11 +0000
Subject: [PATCH] auto-import changelog data from spamassassin-2.60-2.src.rpm
 Fri Sep 26 2003 Chip Turner <cturner@redhat.com> 2.60-2 - update to 2.60 Sat
 Jul 05 2003 Chip Turner <cturner@redhat.com> 2.55-3 - change perl dependency
 to more accurate versions with explicit epochs Wed Jun 04 2003 Elliot Lee
 <sopwith@redhat.com> - rebuilt Sat May 31 2003 Chip Turner
 <cturner@redhat.com> 2.55-1 - move to upstream version 2.55

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

diff --git a/.cvsignore b/.cvsignore
index e82d08c..844f7fd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Mail-SpamAssassin-2.53.tar.gz
+Mail-SpamAssassin-2.60.tar.gz
diff --git a/sources b/sources
index add9ff9..59918bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cbdfdda7fd114e8a85707eedbfc8018  Mail-SpamAssassin-2.53.tar.gz
+46d1db67ed1d860ddb136e0beb5f6ac3  Mail-SpamAssassin-2.60.tar.gz
diff --git a/spamassassin.spec b/spamassassin.spec
index 48025c2..572e5e5 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -6,8 +6,8 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: %{name}
-Version: 2.53
-Release: 8
+Version: 2.60
+Release: 2
 License: Artistic
 Group: Applications/Internet
 URL: http://spamassassin.org/
@@ -18,9 +18,9 @@ Source4: spamassassin-spamc.rc
 Source5: spamassassin.sysconfig
 Source10: spamassassin-helper.sh
 Source99: filter-requires-spamassassin.sh
-Patch: spamassassin-2.50-servicename.patch
+# Patch: spamassassin-2.50-servicename.patch
 # Patch2: spamassassin-2.50-chld.patch
-Requires: perl >= 5.004
+Requires: perl >= 2:5.8.0
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: %{_prefix}
 Prereq: /sbin/chkconfig /sbin/service
@@ -57,11 +57,11 @@ To filter spam for all users, add that line to /etc/procmailrc
 
 %prep
 %setup -q -n %{real_name}-%{version}
-%patch0 -p1 -b .init
+# %%patch0 -p1
 # %%patch2 -p1
 
 %build
-%{__perl} Makefile.PL PREFIX=$RPM_BUILD_ROOT/%{_prefix} SYSCONFDIR=$RPM_BUILD_ROOT/%{_sysconfdir} INST_PREFIX=%{_prefix} INST_SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor
+%{__perl} Makefile.PL PREFIX=$RPM_BUILD_ROOT/%{_prefix} SYSCONFDIR=$RPM_BUILD_ROOT/%{_sysconfdir} INSTALLDIRS=vendor < /dev/null
 
 
 %{__make} OPTIMIZE="$RPM_OPT_FLAGS"
@@ -133,8 +133,21 @@ fi
 exit 0
 
 %changelog
+* Fri Sep 26 2003 Chip Turner <cturner@redhat.com> 2.60-2
+- update to 2.60
+
+* Sat Jul  5 2003 Chip Turner <cturner@redhat.com> 2.55-3
+- change perl dependency to more accurate versions with explicit epochs
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Sat May 31 2003 Chip Turner <cturner@redhat.com> 2.55-1
+- move to upstream version 2.55
+
 * Tue May 13 2003 Chip Turner <cturner@redhat.com>
 - bump for build
+- change init.d script to not default to started
 
 * Sun May 04 2003 Florian La Roche <Florian.LaRoche@redhat.de>
 - remove Distribution: tag in spec file
diff --git a/spamassassin.sysconfig b/spamassassin.sysconfig
index 5f12aa4..9faf7e2 100644
--- a/spamassassin.sysconfig
+++ b/spamassassin.sysconfig
@@ -1,2 +1,2 @@
 # Options to spamd
-SPAMDOPTIONS="-d -c -a"
+SPAMDOPTIONS="-d -c -a -m5 -H"