[mail-notification/epel7] .

[Dmitry Butskoy]

commit 1159bbd6432290762c2194bf3d11ae37e671c2fc
Author: buc <buc at grad.stu.neva.ru>
Date:   Mon Jan 12 23:26:28 2015 +0300

    .

 mail-notification-evo3_11_2.patch |   97 +++++++++++++++++++++++++++++++++++++
 mail-notification.spec            |   14 ++++--
 2 files changed, 106 insertions(+), 5 deletions(-)
---
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 <gtk/gtk.h>
+ #include <libedataserver/eds-version.h>
+-#if EDS_CHECK_VERSION(3,3,5)
+-  #include <libemail-engine/e-mail-session.h>
++#if EDS_CHECK_VERSION(3,11,2)
++  #include <libemail-engine/libemail-engine.h>
+ #else
+-  #if EDS_CHECK_VERSION(2,91,0)
+-    #include <mail/e-mail-session.h>
++  #if EDS_CHECK_VERSION(3,3,5)
++    #include <libemail-engine/e-mail-session.h>
+   #else
+-    /* GOB2 doesn't support private members guarded with an #if */
+-    typedef EMailSession void;
++    #if EDS_CHECK_VERSION(2,91,0)
++      #include <mail/e-mail-session.h>
++    #else
++      /* GOB2 doesn't support private members guarded with an #if */
++      typedef EMailSession void;
++    #endif
+   #endif
+ #endif
+ %}
+@@ -40,10 +44,14 @@
+   #include <mail/mail-component.h>
+ #endif
+ #if EDS_CHECK_VERSION(3,1,0)
+-  #if EDS_CHECK_VERSION(3,3,5)
+-    #include <libemail-engine/e-mail-folder-utils.h>
++  #if EDS_CHECK_VERSION(3,11,2)
++    #include <libemail-engine/libemail-engine.h>
+   #else
+-    #include <mail/e-mail-folder-utils.h>
++    #if EDS_CHECK_VERSION(3,3,5)
++      #include <libemail-engine/e-mail-folder-utils.h>
++    #else
++      #include <mail/e-mail-folder-utils.h>
++    #endif
+   #endif
+   #include <mail/e-mail-browser.h>
+   #include <mail/e-mail-reader.h>
+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 <camel/camel.h>
+ #include <libedataserver/eds-version.h>
+ #include <mail/em-event.h>
++#if EDS_CHECK_VERSION(3,11,2)
++#include <libemail-engine/libemail-engine.h>
++#else
+ #if EDS_CHECK_VERSION(3,3,5)
+ #include <libemail-engine/e-mail-folder-utils.h>
+ #include <libemail-engine/mail-tools.h>
+@@ -34,6 +37,7 @@
+ #include <mail/mail-tools.h>
+ #include <mail/e-mail-folder-utils.h>
+ #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 <mail/em-message-browser.h>
+ #endif
+ #include <mail/em-utils.h>
+-#if EDS_CHECK_VERSION(3,3,5)
+-  #include <libemail-engine/e-mail-session.h>
+-  #include <libemail-engine/mail-tools.h>
++#if EDS_CHECK_VERSION(3,11,2)
++  #include <libemail-engine/libemail-engine.h>
+ #else
+-  #include <mail/mail-tools.h>
+-  #if EDS_CHECK_VERSION(2,91,0)
+-    #include <mail/e-mail-session.h>
++  #if EDS_CHECK_VERSION(3,3,5)
++    #include <libemail-engine/e-mail-session.h>
++    #include <libemail-engine/mail-tools.h>
+   #else
+-    #include <mail/mail-session.h>
++    #include <mail/mail-tools.h>
++    #if EDS_CHECK_VERSION(2,91,0)
++      #include <mail/e-mail-session.h>
++    #else
++      #include <mail/mail-session.h>
++    #endif
+   #endif
+ #endif
+ #include "mn-evolution.h"
diff --git a/mail-notification.spec b/mail-notification.spec
index 364038c..137d854 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -15,9 +15,9 @@ URL:            http://www.nongnu.org/mailnotify/
 # To regenerate source tarball:
 # wget https://github.com/epienbroek/mail-notification/tarball/$git_revision -O mail-notification-$git_revision.tar.gz
 Source0:        mail-notification-%{git_revision}.tar.gz
-# jb build system is turning on -Werror to build itself.  This patch fixes a
-# warning with current gcc
-Patch0: mail-notification-jb-gcc-format.patch
+
+Patch0:	mail-notification-jb-gcc-format.patch
+Patch1:	mail-notification-evo3_11_2.patch
 
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils, scrollkeeper
@@ -29,7 +29,7 @@ BuildRequires:  GConf2-devel, libgnome-devel
 BuildRequires:  dbus-glib-devel
 BuildRequires:  libnotify-devel >= 0.4.1
 BuildRequires:  gmime-devel >= 2.4
-BuildRequires:  gnome-keyring-devel
+BuildRequires:  libgnome-keyring-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gob2 >= 2.0.17
 BuildRequires:  evolution-devel 
@@ -70,6 +70,7 @@ Evolution support for Mail Notification.
 %prep
 %setup -q -n epienbroek-%{name}-%{git_revision}
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -167,7 +168,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
-* Wed Nov 21 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4.64.git.eab5c13
+* Mon Jan 12 2015 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-65.git.eab5c13
+- initial build on RHEL7 with needed patches backported from Fedora
+
+* Wed Nov 21 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-64.git.eab5c13
 - Update to eab5c13 snapshot
 - Fixes new e-mail detection in evolution 3.6
 - Use a more efficient method to retrieve unread mails from