- up to 1.0.11

- libnotify fixed upstream

Changed files:
    xfce4-power-manager-ac-am.patch -> 1.4
    xfce4-power-manager-libnotify.patch -> 1.2
    xfce4-power-manager.spec -> 1.9

diff --git a/xfce4-power-manager-ac-am.patch b/xfce4-power-manager-ac-am.patch
index 076bf7925fdb4119f54e3802e5f628b33841c51f..3da485abba53b8dba9d9c5c4ca27bbfb71fa7447 100644 (file)
--- a/xfce4-power-manager-ac-am.patch
+++ b/xfce4-power-manager-ac-am.patch
@@ -1,15 +1,3 @@
-diff -urN xfce4-power-manager-1.0.3/configure.ac xfce4-power-manager-1.0.3.new//configure.ac
---- xfce4-power-manager-1.0.3/configure.ac     2011-01-04 13:37:58.000000000 +0000
-+++ xfce4-power-manager-1.0.3.new//configure.ac        2011-02-11 19:45:25.683334784 +0000
-@@ -251,7 +251,7 @@
-       ======================================
-  
-       prefix:                 ${prefix}
--      xdg autostart:          ${sysconfdir/xdg/autostart}
-+      xdg autostart:          ${sysconfdir}/xdg/autostart
-       POLKIT:                 ${polkit}
-       DPMS:                   ${have_dpms}
-       Network manager:        ${ac_network_manager}
 diff -urN xfce4-power-manager-1.0.3/src/Makefile.am xfce4-power-manager-1.0.3.new//src/Makefile.am
 --- xfce4-power-manager-1.0.3/src/Makefile.am  2011-01-04 12:22:56.000000000 +0000
 +++ xfce4-power-manager-1.0.3.new//src/Makefile.am     2011-02-11 19:45:51.306668083 +0000

diff --git a/xfce4-power-manager-libnotify.patch b/xfce4-power-manager-libnotify.patch
deleted file mode 100644 (file)
index 969f624..0000000
--- a/xfce4-power-manager-libnotify.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9bc8900b4efef29fdc06331b028c7108df15b856 Mon Sep 17 00:00:00 2001
-From: Nick Schermer <nick@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

diff --git a/xfce4-power-manager.spec b/xfce4-power-manager.spec
index 889f64acd18cde886b4f41a2424a42724ed7e8ba..011cd8afd805612a7fc7e7c4b4e90a4ac768bd18 100644 (file)
--- a/xfce4-power-manager.spec
+++ b/xfce4-power-manager.spec
@@ -1,14 +1,13 @@
 Summary:       Power manager for the Xfce desktop environment
 Summary(pl.UTF-8):     Zarządca energii dla środowiska Xfce
 Name:          xfce4-power-manager
-Version:       1.0.10
-Release:       2
+Version:       1.0.11
+Release:       1
 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
+# Source0-md5: 49689526853f28877b790e7d278f2de5
 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,7 +39,6 @@ Zarządca energii dla środowiska Xfce.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__intltoolize}