rpms/evolution/F-10 evolution-2.24.2-sa-junk-plugin.patch, NONE, 1.1 evolution.spec, 1.363, 1.364

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23978

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.24.2-sa-junk-plugin.patch 
Log Message:

* Sun Dec 14 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.2-3.fc10
- Add patch for RH bug #476438 (bogus spamassassin errors).


evolution-2.24.2-sa-junk-plugin.patch:

--- NEW FILE evolution-2.24.2-sa-junk-plugin.patch ---
diff -up evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c.sa-junk-plugin evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c
--- evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c.sa-junk-plugin	2008-10-13 04:37:00.000000000 -0400
+++ evolution-2.24.2/plugins/sa-junk-plugin/em-junk-filter.c	2008-12-14 14:11:08.000000000 -0500
@@ -250,7 +250,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, 
 		else
 			res = rv_err;
 
-		if (res != 0)
+		if (res >= 64)
 			g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to SpamAssassin failed, error code: %d"), res);
 
 		return res;


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-10/evolution.spec,v
retrieving revision 1.363
retrieving revision 1.364
diff -u -r1.363 -r1.364
--- evolution.spec	9 Dec 2008 17:30:21 -0000	1.363
+++ evolution.spec	14 Dec 2008 19:13:41 -0000	1.364
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.24.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -83,6 +83,9 @@
 # GNOME bug #552583
 Patch16: evolution-2.24.2-broken-account-uris.patch
 
+# RH bug #476438 / GNOME bug #560420
+Patch17: evolution-2.24.2-sa-junk-plugin.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -236,6 +239,7 @@
 %patch14 -p1 -b .im-context-reset
 %patch15 -p1 -b .experimental-plugins
 %patch16 -p1 -b .broken-account-uris
+%patch17 -p1 -b .sa-junk-plugin
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -700,6 +704,9 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Sun Dec 14 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.2-3.fc10
+- Add patch for RH bug #476438 (bogus spamassassin errors).
+
 * Tue Dec 09 2008 Matthew Barnes <mbarnes at redhat.com> - 2.24.2-2.fc10
 - Add patch for GNOME bug #552583 (fix account URI comparisons).