packages (GNOME_2): gnome-bluetooth/gnome-bluetooth.spec, gnome-bluetooth/g...

[lisu]

Author: lisu                         Date: Wed Nov 23 19:43:54 2011 GMT
Module: packages                      Tag: GNOME_2
---- Log message:
- add libnotify 0.7 support
- rel 5

---- Files affected:
packages/gnome-bluetooth:
   gnome-bluetooth.spec (1.86.2.3 -> 1.86.2.4) , gnome-bluetooth-libnotify.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-bluetooth/gnome-bluetooth.spec
diff -u packages/gnome-bluetooth/gnome-bluetooth.spec:1.86.2.3 packages/gnome-bluetooth/gnome-bluetooth.spec:1.86.2.4
--- packages/gnome-bluetooth/gnome-bluetooth.spec:1.86.2.3	Sat Jul  2 00:37:39 2011
+++ packages/gnome-bluetooth/gnome-bluetooth.spec	Wed Nov 23 20:43:49 2011
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	Podsystem GNOME Bluetooth
 Name:		gnome-bluetooth
 Version:	2.32.0
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/2.32/%{name}-%{version}.tar.bz2
 # Source0-md5:	f129686fe46c4c98eb70a0cc85d59cae
+Patch0:		%{name}-libnotify.patch
 URL:		http://live.gnome.org/GnomeBluetooth
 BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf >= 2.52
@@ -118,6 +119,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %{__gtkdocize}
@@ -210,6 +212,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86.2.4  2011/11/23 19:43:49  lisu
+- add libnotify 0.7 support
+- rel 5
+
 Revision 1.86.2.3  2011/07/01 22:37:39  lisu
 - rel 4
 

================================================================
Index: packages/gnome-bluetooth/gnome-bluetooth-libnotify.patch
diff -u /dev/null packages/gnome-bluetooth/gnome-bluetooth-libnotify.patch:1.1.2.1
--- /dev/null	Wed Nov 23 20:43:54 2011
+++ packages/gnome-bluetooth/gnome-bluetooth-libnotify.patch	Wed Nov 23 20:43:49 2011
@@ -0,0 +1,26 @@
+--- applet/notify.c
++++ applet/notify.c
+@@ -31,6 +31,10 @@
+ #include <libnotify/notify.h>
+ #include "notify.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ static GtkStatusIcon *statusicon = NULL;
+ static char *icon_name = NULL;
+ static char *tooltip = NULL;
+@@ -71,7 +75,12 @@
+ 		notify_notification_close(notify, NULL);
+ 	}
+ 
+-	notify = notify_notification_new(summary, message, icon_name, NULL);
++	notify = notify_notification_new(summary, message, icon_name
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	);
++#else
++	, NULL);
++#endif
+ 
+ 	notify_notification_set_timeout(notify, timeout);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-bluetooth/gnome-bluetooth.spec?r1=1.86.2.3&r2=1.86.2.4&f=u