[claws-mail-plugins/f15] 3.7.9-4 fix libnotify support (rhbz#718828)

[Andreas Bierfert]

commit 7cbc0c64b755b5d4f13b68d126e4d327822b2a93
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Tue Jul 5 10:46:53 2011 +0200

    3.7.9-4
    fix libnotify support (rhbz#718828)

 claws-mail-extra-plugins-3.7.6-libnotify07.patch |   25 -----------
 claws-mail-extra-plugins-3.7.9-libnotify07.patch |   49 ++++++++++++++++++++++
 claws-mail-plugins.spec                          |   10 +++-
 3 files changed, 56 insertions(+), 28 deletions(-)
---
diff --git a/claws-mail-extra-plugins-3.7.9-libnotify07.patch b/claws-mail-extra-plugins-3.7.9-libnotify07.patch
new file mode 100644
index 0000000..9807055
--- /dev/null
+++ b/claws-mail-extra-plugins-3.7.9-libnotify07.patch
@@ -0,0 +1,49 @@
+diff -up claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/configure.ac.orig claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/configure.ac
+--- claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/configure.ac.orig	2011-07-05 10:27:14.000000000 +0200
++++ claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/configure.ac	2011-07-05 10:28:44.000000000 +0200
+@@ -151,7 +151,7 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
+ 
+ dnl Check for libnotify support
+ LIBNOTIFY_REQUIRED=0.4.3
+-LIBNOTIFY_TOO_HIGH=0.7.0
++LIBNOTIFY_TOO_HIGH=0.8.0
+ AC_ARG_ENABLE(libnotify,
+ 	[  --disable-libnotify     do not include libnotify support],
+  	[enable_libnotify=$enableval], [enable_libnotify=auto])
+diff -up claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/configure.orig claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/configure
+--- claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/configure.orig	2011-07-05 10:27:03.000000000 +0200
++++ claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/configure	2011-07-05 10:28:37.000000000 +0200
+@@ -14934,7 +14934,7 @@ $as_echo "yes" >&6; }
+ fi
+ 
+ LIBNOTIFY_REQUIRED=0.4.3
+-LIBNOTIFY_TOO_HIGH=0.7.0
++LIBNOTIFY_TOO_HIGH=0.8.0
+ # Check whether --enable-libnotify was given.
+ if test "${enable_libnotify+set}" = set; then :
+   enableval=$enable_libnotify; enable_libnotify=$enableval
+diff -up claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/src/notification_popup.c.orig claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/src/notification_popup.c
+--- claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/src/notification_popup.c.orig	2010-08-31 08:36:59.000000000 +0200
++++ claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/src/notification_popup.c	2011-07-05 10:26:16.000000000 +0200
+@@ -339,7 +339,7 @@ static gboolean notification_libnotify_c
+     break;
+   }
+ 
+-  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
++  ppopup->notification = notify_notification_new(summary, utf8_str, NULL);
+   g_free(utf8_str);
+   if(ppopup->notification == NULL) {
+     debug_print("Notification Plugin: Failed to create a new "
+diff -up claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/src/notification_trayicon.c.orig claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/src/notification_trayicon.c
+--- claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/src/notification_trayicon.c.orig	2011-03-04 17:31:08.000000000 +0100
++++ claws-mail-extra-plugins-3.7.9/notification_plugin-0.27/src/notification_trayicon.c	2011-07-05 10:26:16.000000000 +0200
+@@ -602,8 +602,7 @@ static gboolean notification_trayicon_po
+   summary  = notification_trayicon_popup_assemble_summary();
+   utf8_str = notification_trayicon_popup_assemble_body(msginfo);
+ 
+-  popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
+-  notify_notification_attach_to_status_icon(popup.notification, trayicon);
++  popup.notification = notify_notification_new(summary, utf8_str, NULL);
+ 
+   g_free(summary);
+   g_free(utf8_str);
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index 4921df5..33cdba5 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -22,7 +22,7 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Additional plugins for claws-mail
 
 Group:          Applications/Internet
@@ -31,7 +31,7 @@ URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/claws-mail-extra-plugins-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         claws-mail-extra-plugins-3.7.6-libnotify07.patch
+Patch0:         claws-mail-extra-plugins-3.7.9-libnotify07.patch
 Patch1:         claws-mail-plugins-geolocation-champlain-0.9.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=706322
 Patch2:         claws-mail-plugins-clam-socket.patch
@@ -424,7 +424,7 @@ cd ../newmail-%{newmail}
 
 #notification-plugin
 cd ../notification_plugin-%{notification}
-%configure --disable-static --disable-dependency-tracking
+%configure --disable-static --disable-dependency-tracking --enable-libnotify
 %{__make} %{?_smp_mflags}
 
 #perl
@@ -774,6 +774,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Tue Jul 05 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 3.7.9-4
+- fix libnotify support (rhbz#718828)
+
 * Fri May 20 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 3.7.9-3
 - fix clam plugin crash (#706322)