diff --git a/mail-notification-evo3_11_2.patch b/mail-notification-evo3_11_2.patch new file mode 100644 index 0000000..eb954e1 --- /dev/null +++ b/mail-notification-evo3_11_2.patch @@ -0,0 +1,97 @@ +diff -up epienbroek-mail-notification-eab5c13/src/mn-evolution-folder-tree-server.gob.evo3_11_2 epienbroek-mail-notification-eab5c13/src/mn-evolution-folder-tree-server.gob +--- epienbroek-mail-notification-eab5c13/src/mn-evolution-folder-tree-server.gob.evo3_11_2 2012-11-21 19:57:35.000000000 +0100 ++++ epienbroek-mail-notification-eab5c13/src/mn-evolution-folder-tree-server.gob 2013-11-20 09:26:27.159056391 +0100 +@@ -20,14 +20,18 @@ + %privateheader{ + #include + #include +-#if EDS_CHECK_VERSION(3,3,5) +- #include ++#if EDS_CHECK_VERSION(3,11,2) ++ #include + #else +- #if EDS_CHECK_VERSION(2,91,0) +- #include ++ #if EDS_CHECK_VERSION(3,3,5) ++ #include + #else +- /* GOB2 doesn't support private members guarded with an #if */ +- typedef EMailSession void; ++ #if EDS_CHECK_VERSION(2,91,0) ++ #include ++ #else ++ /* GOB2 doesn't support private members guarded with an #if */ ++ typedef EMailSession void; ++ #endif + #endif + #endif + %} +@@ -40,10 +44,14 @@ + #include + #endif + #if EDS_CHECK_VERSION(3,1,0) +- #if EDS_CHECK_VERSION(3,3,5) +- #include ++ #if EDS_CHECK_VERSION(3,11,2) ++ #include + #else +- #include ++ #if EDS_CHECK_VERSION(3,3,5) ++ #include ++ #else ++ #include ++ #endif + #endif + #include + #include +diff -up epienbroek-mail-notification-eab5c13/src/mn-evolution-plugin.c.evo3_11_2 epienbroek-mail-notification-eab5c13/src/mn-evolution-plugin.c +--- epienbroek-mail-notification-eab5c13/src/mn-evolution-plugin.c.evo3_11_2 2012-11-21 19:57:35.000000000 +0100 ++++ epienbroek-mail-notification-eab5c13/src/mn-evolution-plugin.c 2013-11-20 08:57:17.779176014 +0100 +@@ -27,6 +27,9 @@ + #include + #include + #include ++#if EDS_CHECK_VERSION(3,11,2) ++#include ++#else + #if EDS_CHECK_VERSION(3,3,5) + #include + #include +@@ -34,6 +37,7 @@ + #include + #include + #endif ++#endif + #include "mn-evolution.h" + #include "mn-evolution-server.h" + #include "mn-evolution-plugin.h" +diff -up epienbroek-mail-notification-eab5c13/src/mn-evolution-server.gob.evo3_11_2 epienbroek-mail-notification-eab5c13/src/mn-evolution-server.gob +--- epienbroek-mail-notification-eab5c13/src/mn-evolution-server.gob.evo3_11_2 2012-11-21 19:57:35.000000000 +0100 ++++ epienbroek-mail-notification-eab5c13/src/mn-evolution-server.gob 2013-11-20 09:26:47.055055030 +0100 +@@ -36,15 +36,19 @@ + #include + #endif + #include +-#if EDS_CHECK_VERSION(3,3,5) +- #include +- #include ++#if EDS_CHECK_VERSION(3,11,2) ++ #include + #else +- #include +- #if EDS_CHECK_VERSION(2,91,0) +- #include ++ #if EDS_CHECK_VERSION(3,3,5) ++ #include ++ #include + #else +- #include ++ #include ++ #if EDS_CHECK_VERSION(2,91,0) ++ #include ++ #else ++ #include ++ #endif + #endif + #endif + #include "mn-evolution.h" diff --git a/mail-notification.spec b/mail-notification.spec index 9d003ce..c168a92 100644 --- a/mail-notification.spec +++ b/mail-notification.spec @@ -23,6 +23,9 @@ Patch0: mail-notification-jb-gcc-format.patch # https://bugzilla.redhat.com/show_bug.cgi?id=926114 Patch1: mail-notification-aarch64.patch +# build break when building with evolution 3.11.2 +Patch2: mail-notification-evo3_11_2.patch + BuildRequires: gettext BuildRequires: desktop-file-utils, scrollkeeper BuildRequires: openssl-devel >= 0.9.6 @@ -74,6 +77,7 @@ Evolution support for Mail Notification. %patch0 -p1 %patch1 -p1 +%patch2 -p1 -b .evo3_11_2 %build @@ -177,8 +181,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %changelog -* Tue Nov 19 2013 Milan Crha 5.4-77.git.eab5c13 +* Wed Nov 20 2013 Milan Crha 5.4-77.git.eab5c13 - Rebuild against newer evolution-data-server +- Add patch to be buildable against evolution 3.11.2 release * Sat Oct 26 2013 Erik van Pienbroek - 5.4-76.git.eab5c13 - Rebuild against latest evolution