[gnome-user-share] rebuild against new libnotify

[Matthias Clasen]

commit c1dc5ad6a202cbaf6c6af2c89ab4fb60cd69da0d
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Nov 3 10:20:00 2010 -0400

    rebuild against new libnotify

 gnome-user-share.spec |   26 +++++++++-----------------
 notify.patch          |   30 ++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 17 deletions(-)
---
diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index 7704d20..285c1d7 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,12 +1,15 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.30.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-user-share/2.30/%{name}-%{version}.tar.bz2
 
+# work with libnotify 0.7
+Patch0: notify.patch
+
 Requires: httpd 
 Requires: obex-data-server 
 Requires: mod_dnssd
@@ -45,6 +48,7 @@ The program also allows to share files using ObexFTP over Bluetooth.
 
 %prep
 %setup -q
+%patch0 -p1 -b .notify
 
 %build
 %configure
@@ -65,22 +69,6 @@ desktop-file-install --vendor gnome --delete-original                   \
 
 %find_lang gnome-user-share --with-gnome
 
-# save space by linking identical images in translated docs
-helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
-for f in $helpdir/C/figures/*.png; do
-  b="$(basename $f)"
-  for d in $helpdir/*; do
-    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
-      g="$d/figures/$b"
-      if [ -f "$g" ]; then
-        if cmp -s $f $g; then
-          rm "$g"; ln -s "../../C/figures/$b" "$g"
-        fi
-      fi
-    fi
-  done
-done
-
 %post
 %gconf_schema_upgrade desktop_gnome_file_sharing 
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
@@ -113,6 +101,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Wed Nov  3 2010 Matthias Clasen <mclasen at redhat.com> - 2.30.1-4
+- Rebuild against libnotify 0.7
+- Drop space-saving hack
+
 * Tue Oct 26 2010 Parag Nemade <paragn AT fedoraproject.org> - 2.30.1-3
 - Gconf2 scriptlet accepts schema file names without file extension.
 
diff --git a/notify.patch b/notify.patch
new file mode 100644
index 0000000..bc70fb4
--- /dev/null
+++ b/notify.patch
@@ -0,0 +1,30 @@
+diff -up gnome-user-share-2.30.1/src/obexpush.c.notify gnome-user-share-2.30.1/src/obexpush.c
+--- gnome-user-share-2.30.1/src/obexpush.c.notify	2010-11-03 10:13:20.985241989 -0400
++++ gnome-user-share-2.30.1/src/obexpush.c	2010-11-03 10:15:02.988242018 -0400
+@@ -139,10 +139,9 @@ show_notification (const char *filename)
+ 	/* Translators: %s is the name of the filename received */
+ 	notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display);
+ 	g_free (display);
+-	notification = notify_notification_new_with_status_icon (_("You received a file"),
+-								 notification_text,
+-								 "dialog-information",
+-								 GTK_STATUS_ICON (statusicon));
++	notification = notify_notification_new (_("You received a file"),
++					         notification_text,
++					         "dialog-information");
+ 
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ 
+@@ -218,10 +217,10 @@ device_is_authorised (const char *bdaddr
+ 		char *device_path;
+ 		GHashTable *props;
+ 
+-		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
++		g_message ("checking adapter %s", (char *)g_ptr_array_index (adapters, i));
+ 
+ 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
+-						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
++						    (char *)g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+ 
+ 		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
+ 				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,