diff --git a/evolution-2.27.1-build-break.patch b/evolution-2.27.1-build-break.patch deleted file mode 100644 index 23fe665..0000000 --- a/evolution-2.27.1-build-break.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c.build-break evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c ---- evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c.build-break 2009-05-04 13:27:14.000000000 -0400 -+++ evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c 2009-05-04 13:27:37.000000000 -0400 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/evolution.spec b/evolution.spec index a85fb5b..54f61d8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -68,8 +68,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -Patch13: evolution-2.27.1-build-break.patch - ## Dependencies ### Requires(post): GConf2 @@ -227,7 +225,6 @@ 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 .build-break mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -305,10 +302,10 @@ CFLAGS="$CFLAGS \ -DPANGO_DISABLE_DEPRECATED=1 \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \ - -DEDS_DISABLE_DEPRECATED=1 \ -Wdeclaration-after-statement \ -Werror-implicit-function-declaration" # TODO: Make -DCAMEL_DISABLE_DEPRECATED work. +# TODO: Make -DEDS_DISABLE_DEPRECATED work again. %endif %configure \ @@ -697,6 +694,7 @@ rm -rf $RPM_BUILD_ROOT * Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - Bump evo_major to 2.28. +- Temporarily disable EDS_DISABLE_DEPRECATED due to GNOME bug #569652. * Mon Apr 27 2009 Matthias Clasen - 2.26.1-2.fc11 - Don't drop schemas translations from po files