rpms/spamassassin/FC-5 spamassassin-3.1.1-nls-spamd-init.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 sources, 1.26, 1.27 spamassassin.spec, 1.62, 1.63 spamassassin-3.1.0-nls-spamd-init.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: wtogami

Update of /cvs/dist/rpms/spamassassin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8479

Modified Files:
	.cvsignore sources spamassassin.spec 
Added Files:
	spamassassin-3.1.1-nls-spamd-init.patch 
Removed Files:
	spamassassin-3.1.0-nls-spamd-init.patch 
Log Message:
3.1.1 with a whole bunch of bug fixes


spamassassin-3.1.1-nls-spamd-init.patch:
 redhat-rc-script.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE spamassassin-3.1.1-nls-spamd-init.patch ---
diff -urN Mail-SpamAssassin-3.1.1.orig/spamd/redhat-rc-script.sh Mail-SpamAssassin-3.1.1/spamd/redhat-rc-script.sh
--- Mail-SpamAssassin-3.1.1.orig/spamd/redhat-rc-script.sh	2006-03-10 21:37:38.000000000 -0500
+++ Mail-SpamAssassin-3.1.1/spamd/redhat-rc-script.sh	2006-03-11 20:53:00.000000000 -0500
@@ -11,6 +11,8 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+prog="spamd"
+
 # Source networking configuration.
 . /etc/sysconfig/network
 
@@ -36,7 +38,7 @@
 case "$1" in
   start)
 	# Start daemon.
-	echo -n "Starting spamd: "
+	echo -n $"Starting $prog: "
 	daemon $NICELEVEL spamd $SPAMDOPTIONS -r $SPAMD_PID
 	RETVAL=$?
         echo
@@ -46,7 +48,7 @@
         ;;
   stop)
         # Stop daemons.
-        echo -n "Shutting down spamd: "
+        echo -n $"Stopping $prog: "
         killproc spamd
         RETVAL=$?
         echo


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-5/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	14 Sep 2005 07:39:55 -0000	1.27
+++ .cvsignore	28 Mar 2006 03:37:54 -0000	1.28
@@ -1 +1 @@
-Mail-SpamAssassin-3.1.0.tar.bz2
+Mail-SpamAssassin-3.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	14 Sep 2005 07:39:55 -0000	1.26
+++ sources	28 Mar 2006 03:37:54 -0000	1.27
@@ -1 +1 @@
-d28bd7e83d01b234144e336bbfde0caa  Mail-SpamAssassin-3.1.0.tar.bz2
+33bc2bef2619135125ccf3b5a663be1d  Mail-SpamAssassin-3.1.1.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/FC-5/spamassassin.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- spamassassin.spec	11 Feb 2006 05:42:56 -0000	1.62
+++ spamassassin.spec	28 Mar 2006 03:37:54 -0000	1.63
@@ -5,8 +5,8 @@
 
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
-Version: 3.1.0
-Release: 5.fc5.2
+Version: 3.1.1
+Release: 1.fc6
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -19,7 +19,7 @@
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-Patch122: spamassassin-3.1.0-nls-spamd-init.patch
+Patch123: spamassassin-3.1.1-nls-spamd-init.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
@@ -61,7 +61,7 @@
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-%patch122 -p1
+%patch123 -p1
 # end of patches
 
 %build
@@ -149,10 +149,13 @@
 exit 0
 
 %changelog
-* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.0-5.fc5.2
+* Mon Mar 11 2006 Warren Togami <wtogami at redhat.com> - 3.1.1-1
+- 3.1.1
+
+* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 3.1.0-5
 - bump again for double-long bug on ppc(64)
 
-* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.0-5.fc5.1
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 3.1.0-5
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Wed Jan 18 2006 Warren Togami <wtogami at redhat.com> - 3.1.0-5


--- spamassassin-3.1.0-nls-spamd-init.patch DELETED ---