[mate-applet-softupd/f19] * Tue Apr 16 2013 Patrick Monnerat <pm at datasphere.ch> 0.2.5-4 - Patch "notify" for Mate 1.6 to repla

[Patrick Monnerat]

commit 9aa7a374e30bdf867a1c89a1fe1b9a6f7facc481
Author: Patrick Monnerat <pm at datasphere.ch>
Date:   Tue Apr 16 13:41:53 2013 +0200

    * Tue Apr 16 2013 Patrick Monnerat <pm at datasphere.ch> 0.2.5-4
    - Patch "notify" for Mate 1.6 to replace use of obsolete "libmatenotify" by
      "libnotify".

 mate-applet-softupd-0.2.5-notify.patch |   47 ++++++++++++++++++++++++++++++++
 mate-applet-softupd.spec               |    9 +++++-
 2 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/mate-applet-softupd-0.2.5-notify.patch b/mate-applet-softupd-0.2.5-notify.patch
new file mode 100644
index 0000000..e7fc7e8
--- /dev/null
+++ b/mate-applet-softupd-0.2.5-notify.patch
@@ -0,0 +1,47 @@
+diff -Naur mate-applet-softupd-0.2.5.orig/configure.ac mate-applet-softupd-0.2.5.new/configure.ac
+--- mate-applet-softupd-0.2.5.orig/configure.ac	2013-04-16 12:16:01.486017117 +0200
++++ mate-applet-softupd-0.2.5.new/configure.ac	2013-04-16 12:21:53.186783153 +0200
+@@ -251,7 +251,7 @@
+ PKG_CHECK_MODULES([GTK], [gtk+-2.0])
+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
+ PKG_CHECK_MODULES([PKGKIT_BLIB], [packagekit-glib2])
+-PKG_CHECK_MODULES([LIBMATENOTIFY], [libmatenotify])
++PKG_CHECK_MODULES([LIBNOTIFY], [libnotify])
+ PKG_CHECK_MODULES([LIBMATEPANELAPPLET_4], [libmatepanelapplet-4.0], [FOUND_LMPA_4="yes"], [FOUND_LMPA_4="no"])
+ PKG_CHECK_MODULES([LIBMATEPANELAPPLET_3], [libmatepanelapplet-3.0], [FOUND_LMPA_3="yes"], [FOUND_LMPA_3="no"])
+ if test $FOUND_LMPA_4 = "yes" ; then
+@@ -262,8 +262,8 @@
+ 	AC_MSG_ERROR(["*** libmatepanelapplet not found."])
+ fi
+ 
+-APPLET_FLAGS=`$PKG_CONFIG --cflags-only-I glib-2.0 libmatenotify $LIBMATEPANELAPPLET $ADDITIONAL_PACKAGES`
+-APPLET_LIBS=`$PKG_CONFIG --libs glib-2.0 libmatenotify $LIBMATEPANELAPPLET $ADDITIONAL_PACKAGES`
++APPLET_FLAGS=`$PKG_CONFIG --cflags-only-I glib-2.0 libnotify $LIBMATEPANELAPPLET $ADDITIONAL_PACKAGES`
++APPLET_LIBS=`$PKG_CONFIG --libs glib-2.0 libnotify $LIBMATEPANELAPPLET $ADDITIONAL_PACKAGES`
+ AC_SUBST([APPLET_FLAGS])
+ AC_SUBST([APPLET_LIBS])
+ 
+diff -Naur mate-applet-softupd-0.2.5.orig/src/applet.h mate-applet-softupd-0.2.5.new/src/applet.h
+--- mate-applet-softupd-0.2.5.orig/src/applet.h	2013-03-07 21:30:34.000000000 +0100
++++ mate-applet-softupd-0.2.5.new/src/applet.h	2013-04-16 12:23:28.732440994 +0200
+@@ -21,7 +21,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <mate-panel-applet.h>
+-#include <libmatenotify/notify.h>
++#include <libnotify/notify.h>
+ #include <libintl.h>
+ #include <sys/stat.h>
+ #include <glib.h>
+diff -Naur mate-applet-softupd-0.2.5.orig/src/main.c mate-applet-softupd-0.2.5.new/src/main.c
+--- mate-applet-softupd-0.2.5.orig/src/main.c	2013-03-07 21:30:34.000000000 +0100
++++ mate-applet-softupd-0.2.5.new/src/main.c	2013-04-16 12:28:34.593549622 +0200
+@@ -30,7 +30,7 @@
+ 	GError* error = NULL;
+ 
+ 	notify_init(PACKAGE_NAME);
+-        notification = notify_notification_new (title, body, icon, NULL);
++        notification = notify_notification_new (title, body, icon);
+ 
+         notify_notification_set_timeout (notification, 5000);
+ 
diff --git a/mate-applet-softupd.spec b/mate-applet-softupd.spec
index 7e9b252..1077fc3 100644
--- a/mate-applet-softupd.spec
+++ b/mate-applet-softupd.spec
@@ -1,6 +1,6 @@
 Name:		mate-applet-softupd
 Version:	0.2.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	MATE Software Update Applet 
 Group:		Applications/System
 License:	GPLv2+
@@ -8,8 +8,9 @@ URL:		http://www.zavedil.com/mate-software-updates-applet/
 Source:		http://www.zavedil.com/wp-content/uploads/2013/03/mate-applet-softupd-%{version}.tar.gz
 Patch1:		mate-applet-softupd-0.2.5-badvarset.patch
 Patch2:		mate-applet-softupd-0.2.5-morefrench.patch
+Patch3:		mate-applet-softupd-0.2.5-notify.patch
 BuildRequires:	mate-panel-devel >= 1.3.0
-BuildRequires:	libmatenotify-devel >= 1.2.0
+BuildRequires:	libnotify-devel >= 0.7.0
 BuildRequires:	PackageKit-glib-devel
 BuildRequires:	gettext-devel
 BuildRequires:	PackageKit
@@ -30,6 +31,7 @@ Software updates notification applet for the MATE desktop environment.
 
 %patch1 -p 1 -b .badvarset
 %patch2 -p 1 -b .morefrench
+%patch3 -p 1 -b .notify
 
 autoreconf -i -f
 
@@ -89,6 +91,9 @@ fi
 
 
 %changelog
+* Tue Apr 16 2013 Patrick Monnerat <pm at datasphere.ch> 0.2.5-4
+- Patch "notify" for Mate 1.6 to replace use of obsolete "libmatenotify" by
+  "libnotify".
 
 * Tue Mar 12 2013 Patrick Monnerat <pm at datasphere.ch> 0.2.5-3
 - Patch "morefrench" to add a missing french translation string.