From af0aa9277f8010ca64f9a9e3fa139656d5c2d17e Mon Sep 17 00:00:00 2001
From: Nick Bebout <nb@desktop.bebout.pro>
Date: Jun 07 2011 02:11:13 +0000
Subject: Merge branch 'master' into f13


---

diff --git a/.gitignore b/.gitignore
index 57c0575..30b1d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /Mail-SpamAssassin-3.3.2.tar.bz2
-/Mail-SpamAssassin-rules-3.3.2.r1004932.tgz
-/Mail-SpamAssassin-rules-3.3.2.r1071394.tgz
+/Mail-SpamAssassin-3.3.2.tar.bz2.asc
+/Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz
+/Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc
diff --git a/sources b/sources
index d6d575f..2c56899 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,4 @@
-e1129a862f82fe37a7789173f7d14be3  Mail-SpamAssassin-3.3.2.tar.bz2
-65a45467a761c36e7c5c08d13a3f4501  Mail-SpamAssassin-rules-3.3.2.r1071394.tgz
+253f8fcbeb6c8bfcab9d139865c1a404  Mail-SpamAssassin-3.3.2.tar.bz2
+d848988ae0ab3c8a09077c965fba4df2  Mail-SpamAssassin-3.3.2.tar.bz2.asc
+72f8075499c618518c68c7399f02b458  Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz
+7603e85154d517beafe75cbf3b077c46  Mail-SpamAssassin-rules-3.3.2-r1104058.tar.gz.asc
diff --git a/spamassassin.spec b/spamassassin.spec
index 1e2ff94..538a759 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -55,18 +55,20 @@ Requires: portreserve
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 %global saversion 3.003002
-%global svnrev 1071394
+#%global prerev rc2
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.2
-Release: 0.5.svn%{svnrev}%{?dist}
+#Release: 0.8.%{prerev}%{?dist}
+Release: 1%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
-#Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
-Source0: %{real_name}-%{version}.tar.bz2
-Source1: %{real_name}-rules-%{version}.r%{svnrev}.tgz
+Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
+#Source0: %{real_name}-%{version}-%{prerev}.tar.bz2
+Source1: %{real_name}-rules-%{version}-r1104058.tar.gz
+#Source1: %{real_name}-rules-%{version}.%{prerev}.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -156,6 +158,8 @@ To filter spam for all users, add that line to /etc/procmailrc
 
 # end of patches
 
+echo "RHEL=%{rhel} FEDORA=%{fedora}"
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 %{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null
@@ -231,6 +235,7 @@ install -m 0644 %{SOURCE13} $RPM_BUILD_DIR/Mail-SpamAssassin-%{version}/
 %doc USAGE sample-nonspam.txt sample-spam.txt 
 %doc README.RHEL.Fedora
 %{_initrddir}/spamassassin
+%dir %{_sysconfdir}/mail
 %config(noreplace) %{_sysconfdir}/mail/spamassassin
 %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin
 %config(noreplace) %{_sysconfdir}/sysconfig/sa-update
@@ -278,6 +283,18 @@ fi
 exit 0
 
 %changelog
+* Mon Jun 6 2011 Warren Togami <warren@togami.com> - 3.3.2-1
+- 3.3.2
+
+* Mon May 30 2011 Warren Togami <warren@togami.com> - 3.3.2-0.8.rc2
+- 3.3.2-rc2
+
+* Mon May 16 2011 Warren Togami <warren@togami.com> - 3.3.2-0.7.rc1
+- 3.3.2-rc1
+
+* Sun Feb 27 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.3.2-0.6.svn1071394
+- Own /etc/mail dir (#645035).
+
 * Wed Feb 16 2011 Nick Bebout <nb@fedoraproject.org> - 3.3.2-0.5.svn1071394
 - Oops, I left off svn in the Release of 3.3.2-0.4.svn1071394
 
@@ -556,7 +573,7 @@ exit 0
   SA#4121 Score for user defined rules become ignored
   SA#3944 get_envelope_from not handling received header
 
-* Sun Apr 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 3.0.2-8
+* Sun Apr 10 2005 Ville Skyttä <ville.skytta@iki.fi> - 3.0.2-8
 - Own /usr/share/spamassassin (#152534).
 - Drop no longer needed dependency filter script.
 
@@ -641,7 +658,7 @@ exit 0
 - svn snapshot 20040524
 - svn snapshot 20040518
 
-* Sun May  2 2004 Ville Skyttä <ville.skytta at iki.fi> - 2.63-8
+* Sun May  2 2004 Ville Skyttä <ville.skytta@iki.fi> - 2.63-8
 - #122233
 - Require perl(:MODULE_COMPAT_*).
 - Use %%{_mandir} and %%{_initrddir}.