packages: xfce4-power-manager/xfce4-power-manager.spec, xfce4-power-manager...

[baggins]

Author: baggins                      Date: Thu Apr 21 08:54:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix building with new libnotify

---- Files affected:
packages/xfce4-power-manager:
   xfce4-power-manager.spec (1.7 -> 1.8) , xfce4-power-manager-libnotify.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xfce4-power-manager/xfce4-power-manager.spec
diff -u packages/xfce4-power-manager/xfce4-power-manager.spec:1.7 packages/xfce4-power-manager/xfce4-power-manager.spec:1.8
--- packages/xfce4-power-manager/xfce4-power-manager.spec:1.7	Tue Mar  8 11:31:42 2011
+++ packages/xfce4-power-manager/xfce4-power-manager.spec	Thu Apr 21 10:54:50 2011
@@ -3,12 +3,13 @@
 Summary(pl.UTF-8):	Zarządca energii dla środowiska Xfce
 Name:		xfce4-power-manager
 Version:	1.0.10
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://archive.xfce.org/src/apps/xfce4-power-manager/1.0/%{name}-%{version}.tar.bz2
 # Source0-md5:	38cbd272eb30e36ae538d9f38858bd38
 Patch0:		%{name}-ac-am.patch
+Patch1:		%{name}-libnotify.patch
 URL:		http://goodies.xfce.org/projects/applications/xfce4-power-manager
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.8
@@ -40,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -95,6 +97,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/04/21 08:54:50  baggins
+- rel 2
+- fix building with new libnotify
+
 Revision 1.7  2011/03/08 10:31:42  baggins
 - 1.0.10
 

================================================================
Index: packages/xfce4-power-manager/xfce4-power-manager-libnotify.patch
diff -u /dev/null packages/xfce4-power-manager/xfce4-power-manager-libnotify.patch:1.1
--- /dev/null	Thu Apr 21 10:54:55 2011
+++ packages/xfce4-power-manager/xfce4-power-manager-libnotify.patch	Thu Apr 21 10:54:50 2011
@@ -0,0 +1,22 @@
+From 9bc8900b4efef29fdc06331b028c7108df15b856 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Fri, 25 Mar 2011 07:11:33 +0000
+Subject: Don't attach to the status icon if libnotify >= 0.7.
+
+---
+diff --git a/src/xfpm-notify.c b/src/xfpm-notify.c
+index c93a843..311b0fd 100644
+--- a/src/xfpm-notify.c
++++ b/src/xfpm-notify.c
+@@ -233,9 +233,6 @@ xfpm_notify_new_notification_internal (const gchar *title, const gchar *message,
+ #if !NOTIFY_CHECK_VERSION (0, 7, 0) 
+     if ( icon )
+     	notify_notification_attach_to_status_icon (n, icon);
+-#else
+-    if ( icon )
+-    	notify_notification_attach_to_status_icon (n, icon);
+ #endif
+ #endif
+ 	
+--
+cgit v0.8.3.4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-power-manager/xfce4-power-manager.spec?r1=1.7&r2=1.8&f=u