[mail-notification] Started on evolution 3.0 support (still incomplete)

[epienbro]

commit 1a61929da9b36ba71e311ec866ae1185e6474982
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Feb 2 00:37:26 2011 +0100

    Started on evolution 3.0 support (still incomplete)
    
    Made the build scripts detect evolution 3.0. Still requires some
    additional patching before this package can compile succesfully.
    See http://koji.fedoraproject.org/koji/getfile?taskID=2755817&name=build.log
    for the build logs of a scratch build

 mail-notification-5.4-evolution-3-0-support.patch |   20 ++++++++++++++++++++
 mail-notification.spec                            |   15 ++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/mail-notification-5.4-evolution-3-0-support.patch b/mail-notification-5.4-evolution-3-0-support.patch
new file mode 100644
index 0000000..472594c
--- /dev/null
+++ b/mail-notification-5.4-evolution-3-0-support.patch
@@ -0,0 +1,20 @@
+--- jbsrc/lib/src/extras/jb-evolution-plugin.c.evolution30	2011-02-02 00:09:33.945696868 +0100
++++ jbsrc/lib/src/extras/jb-evolution-plugin.c	2011-02-02 00:28:09.096275028 +0100
+@@ -41,7 +41,7 @@
+   if (! minversion)
+     minversion = "2.12";
+ 
+-  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
++  packages = g_strdup_printf("evolution-plugin-3.0 >= %s libgtkhtml-4.0 gtkhtml-editor-4.0", minversion);
+   result = jb_check_packages("Evolution", "evolution-plugin", packages);
+   g_free(packages);
+ 
+@@ -53,7 +53,7 @@
+       char *plugindir;
+ 
+       jb_message_checking("for the Evolution plugin directory");
+-      plugindir = jb_get_package_variable("evolution-plugin", "plugindir");
++      plugindir = jb_get_package_variable("evolution-plugin-3.0", "plugindir");
+       jb_message_result_string(plugindir ? plugindir : "not found");
+ 
+       if (! plugindir)
diff --git a/mail-notification.spec b/mail-notification.spec
index 6a07eec..cc73bdc 100644
--- a/mail-notification.spec
+++ b/mail-notification.spec
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        5.4
-Release:        29%{?dist}
+Release:        30%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -16,6 +16,7 @@ Patch5:		mail-notification-5.4-icons.patch
 Patch6:		mail-notification-5.4-weak.patch
 Patch7:		mail-notification-5.4-popup-attach.patch
 Patch8:		mail-notification-5.4-kde-trayicon.patch
+Patch9:		mail-notification-5.4-evolution-3-0-support.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
@@ -75,6 +76,11 @@ Evolution support for Mail Notification.
 %patch7 -p1 -b .popup_attach
 %patch8 -p1 -b .kde_trayicon
 
+# Evolution 3.0 requires a patch as the pkgconfig names have changed
+%if 0%{?fedora} >= 15
+%patch9 -p0 -b .evolution30
+%endif
+
 #  Drop #line statements in C sources generated bu .gob,
 #  for the proper debuginfo package
 pushd build/src
@@ -104,6 +110,10 @@ popd
 
 ./jb build
 
+# The build command above hides away all gcc commands and their warnings
+# As they can be interesting show the build log manually
+cat build/build.log
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -199,6 +209,9 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 
 
 %changelog
+* Wed Feb  2 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 5.4-30
+- Added support for evolution 3.0
+
 * Tue Jan 11 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.4-29
 - rebuild for new evolution-data-server-2.91.5