[spamassassin] - replace @@VERSION@@ with current saversion - restart spampd after sa-update cronjob runs - update

[Nick Bebout]

commit f19012ef94c7709bce199dce33a28912451f11ed
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 16 21:15:11 2011 +0000

    - replace @@VERSION@@ with current saversion
    - restart spampd after sa-update cronjob runs
    - update to svn1071394

 .gitignore        |    1 +
 sources           |    4 ++--
 spamassassin.spec |   12 +++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 03446be..e91dae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ Mail-SpamAssassin-3.3.1.tar.bz2
 Mail-SpamAssassin-rules-3.3.1.r923114.tgz
 /Mail-SpamAssassin-3.3.2.tar.bz2
 /Mail-SpamAssassin-rules-3.3.2.r1004932.tgz
+/Mail-SpamAssassin-rules-3.3.2.r1071394.tgz
diff --git a/sources b/sources
index ae1e546..d6d575f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-5507dea43039b26640f65626ef7eeefd  Mail-SpamAssassin-3.3.2.tar.bz2
-11e340894be58fc49c0fbcea623e6f0c  Mail-SpamAssassin-rules-3.3.2.r1004932.tgz
+e1129a862f82fe37a7789173f7d14be3  Mail-SpamAssassin-3.3.2.tar.bz2
+65a45467a761c36e7c5c08d13a3f4501  Mail-SpamAssassin-rules-3.3.2.r1071394.tgz
diff --git a/spamassassin.spec b/spamassassin.spec
index 5c105dd..a6f2897 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -55,17 +55,18 @@ Requires: portreserve
 %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
 
 %global saversion 3.003002
+%global svnrev 1071394
 
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.2
-Release: 0.4.svn1027144%{?dist}
+Release: 0.4.%{svnrev}%{?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: Mail-SpamAssassin-rules-3.3.2.r1004932.tgz
+Source1: %{real_name}-rules-%{version}.r%{svnrev}.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -257,10 +258,10 @@ cmp /etc/sysconfig/spamassassin $TMPFILE || cp $TMPFILE /etc/sysconfig/spamassas
 rm $TMPFILE
 
 if [ -f /etc/spamassassin.cf ]; then
-	%{__mv} /etc/spamassassin.cf /etc/mail/spamassassin/migrated.cf
+        %{__mv} /etc/spamassassin.cf /etc/mail/spamassassin/migrated.cf
 fi
 if [ -f /etc/mail/spamassassin.cf ]; then
-	%{__mv} /etc/mail/spamassassin.cf /etc/mail/spamassassin/migrated.cf
+        %{__mv} /etc/mail/spamassassin.cf /etc/mail/spamassassin/migrated.cf
 fi
 
 %postun
@@ -277,9 +278,10 @@ fi
 exit 0
 
 %changelog
-* Wed Feb 16 2011 Nick Bebout <nb at fedoraproject.org> - 3.3.2-0.4.svn1027144
+* Wed Feb 16 2011 Nick Bebout <nb at fedoraproject.org> - 3.3.2-0.4.svn1071394
 - replace @@VERSION@@ with current saversion
 - restart spampd after sa-update cronjob runs
+- update to svn1071394
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.2-0.3.svn1027144
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild