From 9d5f0d8b060d2eb2b6c8ac4be67d5a52ca9c39dd Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 3 Nov 2010 17:09:24 -0400
Subject: rebuild against new libnotify

---
 gnome-applets-dbus-glib.patch | 12 ++++++++++++
 gnome-applets-notify.patch    | 13 +++++++++++++
 gnome-applets.spec            | 11 ++++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 gnome-applets-dbus-glib.patch
 create mode 100644 gnome-applets-notify.patch

diff --git a/gnome-applets-dbus-glib.patch b/gnome-applets-dbus-glib.patch
new file mode 100644
index 0000000..fcece10
--- /dev/null
+++ b/gnome-applets-dbus-glib.patch
@@ -0,0 +1,12 @@
+diff -up gnome-applets-2.32.0/configure.in.dbus-glib gnome-applets-2.32.0/configure.in
+--- gnome-applets-2.32.0/configure.in.dbus-glib	2010-11-03 16:46:18.251241996 -0400
++++ gnome-applets-2.32.0/configure.in	2010-11-03 16:46:55.642242004 -0400
+@@ -273,7 +273,7 @@ AC_SUBST(XML2_LIBS)
+ 
+  dnl -- check for libgweather (required for gweather applet) ------------------
+ build_libgweather_applets=false
+-PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED,
++PKG_CHECK_MODULES(LIBGWEATHER, gweather >= $GWEATHER_REQUIRED dbus-glib-1,
+ 	          build_libgweather_applets=true,
+ 		  AC_MSG_WARN([libgweather not found. Not building the weather applet.]))
+ AC_SUBST(LIBGWEATHER_CFLAGS)
diff --git a/gnome-applets-notify.patch b/gnome-applets-notify.patch
new file mode 100644
index 0000000..e8514e2
--- /dev/null
+++ b/gnome-applets-notify.patch
@@ -0,0 +1,13 @@
+diff -up gnome-applets-2.32.0/gweather/gweather-applet.c.notify gnome-applets-2.32.0/gweather/gweather-applet.c
+--- gnome-applets-2.32.0/gweather/gweather-applet.c.notify	2010-11-03 16:59:56.081241996 -0400
++++ gnome-applets-2.32.0/gweather/gweather-applet.c	2010-11-03 17:00:04.367241996 -0400
+@@ -471,8 +471,7 @@ update_finish (WeatherInfo *info, gpoint
+ 			 if (icon == NULL)
+ 				 icon = "stock-unknown";
+ 	           	 
+-			 n = notify_notification_new (message, detail, icon,
+-					 gw_applet->container);
++			 n = notify_notification_new (message, detail, icon);
+ 	
+ 		   	 notify_notification_show (n, &error);
+ 			 if (error)
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 656d105..fd84c26 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -33,7 +33,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.32.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -59,6 +59,10 @@ Patch42:	stickynotes-null.patch
 Patch50:        gnome-applets-libs.patch
 Patch51:        pymod-check.patch
 
+Patch52:        gnome-applets-dbus-glib.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=632803
+Patch53:        gnome-applets-notify.patch
+
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -146,6 +150,8 @@ tar xjf %{SOURCE2}
 %patch35 -p1 -b .modemlights-libgnome
 %patch50 -p1 -b .libs
 %patch51 -p1 -b .pymod
+%patch52 -p1 -b .dbus-glib
+%patch53 -p1 -b .notify
 
 autoreconf -i -f
 
@@ -318,6 +324,9 @@ fi
 
 
 %changelog
+* Wed Nov  3 2010 Matthias Clasen <mclasen@redhat.com> - 1:2.32.0-3
+- Rebuild against libnotify 0.7.0
+
 * Mon Oct 11 2010 Matthias Clasen <mclasen@redhat.com> - 1:2.32.0-2
 - Rebuild without gucharmap support
 
-- 
cgit