rpms/xfce4-power-manager/F-11 xfce4-power-manager-0.8.0beta1-button-hal.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-power-manager.spec, 1.4, 1.5

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-power-manager/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20363

Modified Files:
	.cvsignore sources xfce4-power-manager.spec 
Added Files:
	xfce4-power-manager-0.8.0beta1-button-hal.patch 
Log Message:
* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
- Add xfpm-button-hal.patch by Mike Massonnet


xfce4-power-manager-0.8.0beta1-button-hal.patch:

--- NEW FILE xfce4-power-manager-0.8.0beta1-button-hal.patch ---
--- xfce4-power-manager-0.8.0beta1.orig/src/xfpm-button-hal.c	2009-04-10 21:12:15.000000000 +0200
+++ xfce4-power-manager-0.8.0beta1/src/xfpm-button-hal.c	2009-04-13 21:14:10.000000000 +0200
@@ -71,27 +71,27 @@
 
     TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 
-    if ( xfpm_strequal (detail, "power")  && !bt->priv->keys & POWER_KEY )
+    if ( xfpm_strequal (detail, "power")  && !(bt->priv->keys & POWER_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_POWER_OFF);
     }
-    else if ( xfpm_strequal (detail, "sleep")  && !bt->priv->keys & SLEEP_KEY )
+    else if ( xfpm_strequal (detail, "sleep")  && !(bt->priv->keys & SLEEP_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_SLEEP);
     }
-    else if ( xfpm_strequal (detail, "hibernate") && !bt->priv->keys & HIBERNATE_KEY )
+    else if ( xfpm_strequal (detail, "hibernate") && !(bt->priv->keys & HIBERNATE_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_HIBERNATE);
     }
-    else if ( xfpm_strequal (detail, "brightness-up")  && !bt->priv->keys & BRIGHTNESS_KEY )
+    else if ( xfpm_strequal (detail, "brightness-up")  && !(bt->priv->keys & BRIGHTNESS_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_MON_BRIGHTNESS_UP);
     }
-    else if ( xfpm_strequal (detail, "brightness-down")  && !bt->priv->keys & BRIGHTNESS_KEY )
+    else if ( xfpm_strequal (detail, "brightness-down")  && !(bt->priv->keys & BRIGHTNESS_KEY) )
     {
 	TRACE ("Emitting signal button press condition %s detail %s", condition, detail);
 	g_signal_emit (G_OBJECT (bt), signals [HAL_BUTTON_PRESSED], 0, BUTTON_MON_BRIGHTNESS_DOWN);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	24 Mar 2009 19:19:25 -0000	1.3
+++ .cvsignore	13 Apr 2009 20:38:01 -0000	1.4
@@ -1 +1 @@
-xfce4-power-manager-0.6.5.tar.bz2
+xfce4-power-manager-0.8.0beta1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	24 Mar 2009 19:19:25 -0000	1.3
+++ sources	13 Apr 2009 20:38:01 -0000	1.4
@@ -1 +1 @@
-3db8d413b90e2b6bf1df4d5c06e7d2fb  xfce4-power-manager-0.6.5.tar.bz2
+6d860b824430b654d084d7fb9db1c279  xfce4-power-manager-0.8.0beta1.tar.bz2


Index: xfce4-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-power-manager/F-11/xfce4-power-manager.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-power-manager.spec	24 Mar 2009 19:19:25 -0000	1.4
+++ xfce4-power-manager.spec	13 Apr 2009 20:38:01 -0000	1.5
@@ -1,19 +1,24 @@
+%define betaversion beta1
+
 Name:           xfce4-power-manager
-Version:        0.6.5
-Release:        1%{?dist}
+Version:        0.8.0
+Release:        0.2.%{betaversion}%{?dist}
 Summary:        Power management for the Xfce desktop environment
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/applications/%{name}
-Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Source0:        http://goodies.xfce.org/releases/%{name}/%{name}-%{version}%{betaversion}.tar.bz2
+# Posted on goodies-dev and applied upstream on Apr 11th 2009
+Patch0:         xfce4-power-manager-0.8.0beta1-button-hal.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xfconf-devel >= 4.5.90 
-BuildRequires:  libxfcegui4-devel >= 4.4.1
-BuildRequires:  dbus-glib-devel >= 0.5.6
-BuildRequires:  hal-devel >= 0.5.6
+BuildRequires:  xfconf-devel >= 4.6.0
+BuildRequires:  xfce4-panel-devel >= 4.6.0
+BuildRequires:  dbus-devel >= 0.60
+BuildRequires:  dbus-glib-devel >= 0.70
 BuildRequires:  libnotify-devel >= 0.4.1
+BuildRequires:  libglade2-devel >= 2.0.0
 BuildRequires:  gettext intltool desktop-file-utils
 Requires:       xfce4-panel
 
@@ -25,7 +30,8 @@
 
 
 %prep
-%setup -q
+%setup -qn %{name}-%{version}%{betaversion}
+%patch0 -p1 -b .button-hal
 
 
 %build
@@ -66,17 +72,33 @@
 %{_bindir}/%{name}
 %{_bindir}/xfce4-power-manager-settings
 %config %{_sysconfdir}/xdg/autostart/%{name}.desktop
+%{_libexecdir}/xfce4/panel-plugins/xfce4-*-plugin
 %{_datadir}/applications/%{name}-settings.desktop
-%{_datadir}/icons/hicolor/scalable/apps/xfpm-cpu.svg
+%{_datadir}/icons/hicolor/scalable/apps/gnome-inhibit-applet.svg
 %{_datadir}/icons/hicolor/scalable/*/gpm-*.svg
+%{_datadir}/xfce4/panel-plugins/xfce4-*-plugin.desktop
 %doc %{_datadir}/xfce4/doc/C/images/*.png
 %doc %{_datadir}/xfce4/doc/C/%{name}.html
+%{_mandir}/man1/%{name}-settings.1.gz
+%{_mandir}/man1/%{name}.1.gz
 
 
 %changelog
+* Mon Apr 13 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.2.beta1
+- Add xfpm-button-hal.patch by Mike Massonnet
+
+* Sun Apr 12 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.beta1
+- Update to 0.8.0beta1
+
+* Thu Apr 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.alpha2
+- Update to 0.8.0alpha2
+
+* Thu Apr 02 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-0.1.alpha
+- Update to 0.8.0alpha 
+
 * Tue Mar 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.6.5-1
 - Update to 0.6.5
-- Remove custom autostart desktop
+- Remove custom autostart file
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild