From ba874dd6ca662396cb8aec381ee69812ceb10b9a Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Fri, 2 Mar 2007 19:10:34 +0000
Subject: [PATCH] 3.2.0-pre2

---
 .cvsignore        |  2 +-
 sources           |  2 +-
 spamassassin.spec | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1c78823..1aecda6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Mail-SpamAssassin-3.1.8.tar.bz2
+Mail-SpamAssassin-3.2.0-pre2.tar.bz2
diff --git a/sources b/sources
index 6393a46..e4b1540 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8184a9a4ff11da5bd20b294cfeac7ac  Mail-SpamAssassin-3.1.8.tar.bz2
+b530e3b3b828cc0fbe8ee738a300dcef  Mail-SpamAssassin-3.2.0-pre2.tar.bz2
diff --git a/spamassassin.spec b/spamassassin.spec
index bf6a9c5..b820b67 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -9,14 +9,17 @@
 %define real_name Mail-SpamAssassin
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
+# temporary pre-release number
+%define pre pre2
+
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
-Version: 3.1.8
-Release: 2%{?dist}
+Version: 3.2.0
+Release: 0.1.%{pre}%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{pre}.tar.bz2
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -28,8 +31,6 @@ Source10: spamassassin-helper.sh
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-Patch124: spamassassin-3.1.3-serviceorder.patch
-Patch125: spamassassin-3.1.8-sa-learn.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
@@ -85,8 +86,6 @@ To filter spam for all users, add that line to /etc/procmailrc
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-%patch124 -p1
-%patch125 -p1
 # end of patches
 
 %build
@@ -140,7 +139,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/spamassassin
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-%doc BUGS LICENSE NOTICE CREDITS Changes README STATUS TRADEMARK UPGRADE
+%doc LICENSE NOTICE CREDITS Changes README TRADEMARK UPGRADE
 %doc USAGE sample-nonspam.txt sample-spam.txt
 %config %{_initrddir}/spamassassin
 %config(noreplace) %{_sysconfdir}/mail/spamassassin
@@ -188,6 +187,9 @@ fi
 exit 0
 
 %changelog
+* Fri Mar 02 2007 Warren Togami <wtogami@redhat.com> 3.2.0-0.1.pre2
+- 3.2.0-pre2
+
 * Mon Feb 19 2007 Warren Togami <wtogami@redhat.com> 3.1.8-2
 - Fix sa-learn regression (#228968)