diff --git a/evolution-2.10.3-server-message-double-free.patch b/evolution-2.10.3-server-message-double-free.patch deleted file mode 100644 index 8c4316c..0000000 --- a/evolution-2.10.3-server-message-double-free.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up evolution-2.10.3/mail/mail-session.c.server-message-double-free evolution-2.10.3/mail/mail-session.c ---- evolution-2.10.3/mail/mail-session.c.server-message-double-free 2008-03-25 10:01:13.000000000 -0400 -+++ evolution-2.10.3/mail/mail-session.c 2008-03-25 10:01:25.000000000 -0400 -@@ -389,10 +389,8 @@ alert_user(CamelSession *session, CamelS - mail_msg_unref (m); - } - -- if (m->ismain) { -- user_message_free (m); -+ if (m->ismain) - mail_msg_unref (m); -- } - - return result; - } diff --git a/evolution.spec b/evolution.spec index a9fdd9c..dcd0efe 100644 --- a/evolution.spec +++ b/evolution.spec @@ -84,9 +84,6 @@ Patch15: evolution-2.9.1-im-context-reset.patch # RH bug #437208 / GNOME bug #518103 Patch16: evolution-2.22.0-line-status.patch -# GNOME bug #524310 -Patch17: evolution-2.10.3-server-message-double-free.patch - ## Dependencies ### Requires(post): GConf2 @@ -233,7 +230,6 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset %patch16 -p1 -b .line-status -%patch17 -p1 -b .server-message-double-free mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -663,6 +659,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Apr 07 2008 Matthew Barnes - 2.22.1-1.fc9 - Update to 2.22.1 +- Remove patch for GNOME bug #524310 (fixed upstream). * Tue Mar 25 2008 Dan Williams - 2.22.0-4.fc9 - Add patch for GNOME bug #524310