From 59bf1828684a8d16e46b674388fd03034643ba5c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Apr 2009 16:53:51 +0000 Subject: [PATCH] - Add patch for GNOME bug #578685 (attachment bar crasher). --- evolution-2.26.1-attachment-bar-crasher.patch | 12 ++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 evolution-2.26.1-attachment-bar-crasher.patch diff --git a/evolution-2.26.1-attachment-bar-crasher.patch b/evolution-2.26.1-attachment-bar-crasher.patch new file mode 100644 index 0000000..4cc84d2 --- /dev/null +++ b/evolution-2.26.1-attachment-bar-crasher.patch @@ -0,0 +1,12 @@ +diff -up evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher evolution-2.26.1/widgets/misc/e-attachment-bar.c +--- evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher 2009-04-14 12:49:45.000000000 -0400 ++++ evolution-2.26.1/widgets/misc/e-attachment-bar.c 2009-04-14 12:50:54.000000000 -0400 +@@ -450,6 +450,8 @@ update (EAttachmentBar *bar) + if (desc) + desc = g_strdup (desc); + } ++ } else { ++ desc = g_strdup (desc); + } + + if (!desc) diff --git a/evolution.spec b/evolution.spec index c8e44c5..e79a08b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -68,6 +68,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# GNOME bug #578685 +Patch13: evolution-2.26.1-attachment-bar-crasher.patch + ## Dependencies ### Requires(post): GConf2 @@ -225,6 +228,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .attachment-bar-crasher mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -691,6 +695,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Apr 14 2009 Matthew Barnes - 2.26.1-2.fc11 +- Add patch for GNOME bug #578685 (attachment bar crasher). + * Mon Apr 13 2009 Matthew Barnes - 2.26.1-1.fc11 - Update to 2.26.1