rpms/spamassassin/devel spamassassin-3.1.8-sa-learn.patch, NONE, 1.1 spamassassin.spec, 1.86, 1.87

[fedora-cvs-commits at redhat.com]

Author: wtogami

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

Modified Files:
	spamassassin.spec 
Added Files:
	spamassassin-3.1.8-sa-learn.patch 
Log Message:
Fix sa-learn regression (#228968)


spamassassin-3.1.8-sa-learn.patch:
 sa-learn.raw |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE spamassassin-3.1.8-sa-learn.patch ---
http://issues.apache.org/SpamAssassin/show_bug.cgi?id=5336

diff -urN Mail-SpamAssassin-3.1.8.orig/sa-learn.raw Mail-SpamAssassin-3.1.8/sa-learn.raw
--- Mail-SpamAssassin-3.1.8.orig/sa-learn.raw	2007-02-13 13:17:14.000000000 -0500
+++ Mail-SpamAssassin-3.1.8/sa-learn.raw	2007-02-19 10:58:45.665806000 -0500
@@ -401,7 +401,10 @@
 
     # make sure the target list is in the normal AI format
     if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) {
-      $targets[$elem] = target($targets[$elem]);
+      my $item = splice @targets, $elem, 1;
+      $elem--; # go back to this element again
+      target($item); # add back to the list
+      next;
     }
   }
 


Index: spamassassin.spec
===================================================================
RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- spamassassin.spec	13 Feb 2007 20:58:07 -0000	1.86
+++ spamassassin.spec	19 Feb 2007 16:10:11 -0000	1.87
@@ -12,7 +12,7 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: spamassassin
 Version: 3.1.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
@@ -29,6 +29,7 @@
 # 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,6 +86,7 @@
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
 %patch124 -p1
+%patch125 -p1
 # end of patches
 
 %build
@@ -186,6 +188,9 @@
 exit 0
 
 %changelog
+* Mon Feb 19 2007 Warren Togami <wtogami at redhat.com> 3.1.8-2
+- Fix sa-learn regression (#228968)
+
 * Tue Feb 13 2007 Warren Togami <wtogami at redhat.com> 3.1.8-1
 - 3.1.8 CVE-2007-0451