[xfce4-power-manager] - Update to 1.0.3 - No longer require hal because the brightness backend was removed - Require polki

Sun Jan 9 01:37:41 UTC 2011

commit e5b7fdf4d1344b7c114dc93a669346bbbb35bac5
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sun Jan 9 02:37:29 2011 +0100

    - Update to 1.0.3
    - No longer require hal because the brightness backend was removed
    - Require polkit

 .gitignore                                      |    1 +
 sources                                         |    2 +-
 xfce4-power-manager-1.0.1-dsofix.patch          |   24 +++++++++++
 xfce4-power-manager-1.0.1-libnotify-0.7.0.patch |   18 ++++++++
 xfce4-power-manager.spec                        |   48 +++++++++++++++--------
 5 files changed, 76 insertions(+), 17 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 9e2b2a9..5d1e5c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xfce4-power-manager-0.8.4.2.tar.bz2
 /xfce4-power-manager-0.8.5.tar.bz2
+/xfce4-power-manager-1.0.3.tar.bz2
diff --git a/sources b/sources
index 166042c..6225e5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca6a1fff1d4fee86844c2f5621e9fb87  xfce4-power-manager-0.8.5.tar.bz2
+5dac3686a2419e367721f34b21c528a1  xfce4-power-manager-1.0.3.tar.bz2
diff --git a/xfce4-power-manager-1.0.1-dsofix.patch b/xfce4-power-manager-1.0.1-dsofix.patch
new file mode 100644
index 0000000..eae53bb
--- /dev/null
+++ b/xfce4-power-manager-1.0.1-dsofix.patch
@@ -0,0 +1,24 @@
+diff -Nur xfce4-power-manager-1.0.1.orig/panel-plugins/brightness/Makefile.in xfce4-power-manager-1.0.1/panel-plugins/brightness/Makefile.in
+--- xfce4-power-manager-1.0.1.orig/panel-plugins/brightness/Makefile.in	2010-08-30 11:13:09.000000000 +0200
++++ xfce4-power-manager-1.0.1/panel-plugins/brightness/Makefile.in	2010-09-06 03:01:16.000000000 +0200
+@@ -199,7 +199,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lX11 -lXrandr
+ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
+ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+ LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
+diff -Nur xfce4-power-manager-1.0.1.orig/src/Makefile.in xfce4-power-manager-1.0.1/src/Makefile.in
+--- xfce4-power-manager-1.0.1.orig/src/Makefile.in	2010-08-30 11:13:09.000000000 +0200
++++ xfce4-power-manager-1.0.1/src/Makefile.in	2010-09-06 02:57:20.000000000 +0200
+@@ -227,7 +227,7 @@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -lm
+ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
+ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
+ LIBNOTIFY_REQUIRED_VERSION = @LIBNOTIFY_REQUIRED_VERSION@
diff --git a/xfce4-power-manager-1.0.1-libnotify-0.7.0.patch b/xfce4-power-manager-1.0.1-libnotify-0.7.0.patch
new file mode 100644
index 0000000..b318c5f
--- /dev/null
+++ b/xfce4-power-manager-1.0.1-libnotify-0.7.0.patch
@@ -0,0 +1,18 @@
+--- xfce4-power-manager-1.0.1.orig/src/xfpm-notify.c	2010-05-19 11:22:27.000000000 +0200
++++ xfce4-power-manager-1.0.1/src/xfpm-notify.c	2010-12-17 11:05:26.087627800 +0100
+@@ -209,14 +209,11 @@
+ {
+     NotifyNotification *n;
+     
+-    n = notify_notification_new (title, message, NULL, NULL);
++    n = notify_notification_new (title, message, NULL);
+     
+     if ( icon_name )
+     	xfpm_notify_set_notification_icon (n, icon_name);
+ 	
+-    if ( icon )
+-    	notify_notification_attach_to_status_icon (n, icon);
+-	
+     notify_notification_set_urgency (n, (NotifyUrgency)urgency);
+     
+     if ( timeout != 0)
diff --git a/xfce4-power-manager.spec b/xfce4-power-manager.spec
index 56405b1..c3bd68c 100644
--- a/xfce4-power-manager.spec
+++ b/xfce4-power-manager.spec
@@ -1,7 +1,8 @@
-%global minorversion 0.8
+%global minorversion 1.0
+%global xfceversion 4.7
 
 Name:           xfce4-power-manager
-Version:        0.8.5
+Version:        1.0.3
 Release:        1%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
@@ -9,19 +10,21 @@ Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
 Source0:        http://archive.xfce.org/src/apps/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
-Patch0:         xfce4-power-manager-0.8.5-libnotify-0.7.0.patch
+Patch0:         xfce4-power-manager-1.0.1-dsofix.patch
+Patch1:         xfce4-power-manager-1.0.1-libnotify-0.7.0.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xfconf-devel >= 4.6.0
-BuildRequires:  xfce4-panel-devel >= 4.6.0
+BuildRequires:  xfconf-devel >= %{xfceversion}
+BuildRequires:  xfce4-panel-devel >= %{xfceversion}
 BuildRequires:  dbus-devel >= 0.60
 BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  libnotify-devel >= 0.4.1
+BuildRequires:  libXrandr-devel >= 1.2.0
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  gettext intltool desktop-file-utils
-Requires:       xfce4-panel
+Requires:       xfce4-panel >= %{xfceversion}
 Requires:       xfce4-doc
-Requires:       hal
+Requires:       polkit
 
 %description
 Xfce Power Manager uses the information and facilities provided by HAL to 
@@ -32,8 +35,10 @@ preferences.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dsofix
+
 %if 0%{?fedora} >= 15
-%patch0 -p1 -b .libnotify-0.7.0
+%patch1 -p1 -b .libnotify-0.7.0
 %endif
 
 
@@ -46,10 +51,8 @@ make %{?_smp_mflags} V=1
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 %find_lang %{name}
-desktop-file-install                                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --delete-original                                       \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-settings.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-settings.desktop      
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -75,12 +78,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_bindir}/%{name}
 %{_bindir}/%{name}-settings
+%{_bindir}/xfce4-power-information
+%{_sbindir}/xfpm-power-backlight-helper
 %config %{_sysconfdir}/xdg/autostart/%{name}.desktop
-%{_libexecdir}/xfce4/panel-plugins/xfce4-*-plugin
+%{_libdir}/xfce4/panel-plugins/xfce4-brightness-plugin
 %{_datadir}/applications/%{name}-settings.desktop
-%{_datadir}/icons/hicolor/*/*/xfpm-*.png
-%{_datadir}/icons/hicolor/scalable/*/xfpm-*.svg
-%{_datadir}/xfce4/panel-plugins/xfce4-*-plugin.desktop
+%{_datadir}/icons/hicolor/*/*/*.*
+%{_datadir}/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
+%{_datadir}/polkit-1/actions/org.xfce.power.policy
 %doc %{_datadir}/xfce4/doc/C/images/*.png
 %doc %{_datadir}/xfce4/doc/C/%{name}.html
 %{_mandir}/man1/%{name}-settings.1.*
@@ -88,6 +93,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Dec 04 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.3-1
+- Update to 1.0.3
+- No longer require hal because the brightness backend was removed
+- Require polkit
+
+* Sun Dec 19 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2
+
+* Thu Dec 16 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1-0.1-1
+- Update to 1.0.1 on Xfce 4.8 pre2
+
 * Sat Nov 06 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.5-1
 - Update to 0.8.5
 - Fix for libnotify 0.7.0
