diff --git a/evolution-2.11.91-compilation-breakage.patch b/evolution-2.11.91-compilation-breakage.patch new file mode 100644 index 0000000..9c3e4f1 --- /dev/null +++ b/evolution-2.11.91-compilation-breakage.patch @@ -0,0 +1,11 @@ +--- evolution-2.11.91/calendar/gui/e-cal-popup.c.compilation-breakage 2007-08-24 02:50:09.000000000 -0400 ++++ evolution-2.11.91/calendar/gui/e-cal-popup.c 2007-08-28 15:01:22.000000000 -0400 +@@ -693,7 +693,7 @@ + + source = e_source_selector_peek_primary_selection (selector); + uri = e_source_get_uri (source); +- if (!uri || (g_strncasecmp (uri, "file://", 7) && g_strncasecmp (uri, "contacts://", 11))) { ++ if (!uri || (g_ascii_strncasecmp (uri, "file://", 7) && g_ascii_strncasecmp (uri, "contacts://", 11))) { + /* check for e_target_selector's offline_status property here */ + offline = e_source_get_property (source, "offline"); + diff --git a/evolution.spec b/evolution.spec index 45eb7e1..33e06ad 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.91 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -121,6 +121,9 @@ Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch +# The usual compilation breakage... +Patch35: evolution-2.11.91-compilation-breakage.patch + ## Dependencies ### Requires(post): GConf2 @@ -252,6 +255,7 @@ Development files needed for building things which link against evolution. %patch31 -p1 -b .meeting-list-view %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box +%patch35 -p1 -b .compilation-breakage mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -694,6 +698,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Aug 28 2007 Matthew Barnes - 2.11.91-2.fc8 +- Fix compilation breakage caused by our strict build settings. + * Tue Aug 28 2007 Milan Crha - 2.11.91-1.fc8 - Update to 2.11.91 - Removed patch for RH bug #157400 / GNOME bug #303877 (fixed upstream).