diff --git a/evolution-2.10.1-calendar-component.patch b/evolution-2.10.1-calendar-component.patch new file mode 100644 index 0000000..59982b5 --- /dev/null +++ b/evolution-2.10.1-calendar-component.patch @@ -0,0 +1,17 @@ +--- evolution-2.10.1/calendar/gui/calendar-component.c.calendar-component 2007-05-07 14:07:16.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-07 14:11:48.000000000 -0400 +@@ -210,7 +210,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + personal_source = source; + break; + } diff --git a/evolution.spec b/evolution.spec index ed804a5..02d94b4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -173,6 +173,9 @@ Patch51: evolution-2.10.1-en_CA-attribution-format.patch # RH bug #238551 / GNOME bug #434981 Patch52: evolution-2.10.1-e-attachment-bar.patch +# RH bug #238155 / GNOME bug #427232 +Patch53: evolution-2.10.1-calendar-component.patch + ## Dependencies ### Requires(post): GConf2 @@ -330,6 +333,7 @@ Development files needed for building things which link against evolution. %patch50 -p1 -b .fix-uri-handling %patch51 -p1 -b .en_CA-attribution-format %patch52 -p1 -b .e-attachment-bar +%patch53 -p1 -b .calendar-component mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -751,6 +755,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon May 07 2007 Matthew Barnes - 2.10.1-13.fc7 +- Add patch for RH bug #238155 (crash on startup). + * Tue May 01 2007 Matthew Barnes - 2.10.1-12.fc7 - Add patch for RH bug #238551 (incorrect attachment count).