rpms/gnome-power-manager/F-13 fix-hal-enable-build.patch, NONE, 1.1 gnome-power-manager.spec, 1.182, 1.183

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-power-manager/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25334

Modified Files:
	gnome-power-manager.spec 
Added Files:
	fix-hal-enable-build.patch 
Log Message:
* Mon Mar 15 2010 Bastien Nocera <bnocera at redhat.com> 2.29.91-3
- Really enable HAL build and fix compilation (#572896)


fix-hal-enable-build.patch:
 gpm-brightness-hal.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE fix-hal-enable-build.patch ---
commit fdcf156c85c10a6053b7364d882611df07000343
Author: Chris Coulson <chrisccoulson at googlemail.com>
Date:   Tue Mar 2 08:59:31 2010 +0000

    Declare GError in gpm_brightness_hal_init to fix build failure

diff --git a/src/gpm-brightness-hal.c b/src/gpm-brightness-hal.c
index 64bf30e..5b80fea 100644
--- a/src/gpm-brightness-hal.c
+++ b/src/gpm-brightness-hal.c
@@ -441,6 +441,7 @@ gpm_brightness_hal_init (GpmBrightnessHal *brightness)
 	HalDevice *device;
 	gboolean res;
 	DBusGConnection *connection;
+	GError *error = NULL;
 
 	brightness->priv = GPM_BRIGHTNESS_HAL_GET_PRIVATE (brightness);
 	brightness->priv->proxy = NULL;


Index: gnome-power-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-power-manager/F-13/gnome-power-manager.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -p -r1.182 -r1.183
--- gnome-power-manager.spec	11 Mar 2010 17:41:26 -0000	1.182
+++ gnome-power-manager.spec	15 Mar 2010 11:34:20 -0000	1.183
@@ -5,7 +5,7 @@
 Summary: GNOME power management service
 Name: gnome-power-manager
 Version: 2.29.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 #Release: 0.5.%{?alphatag}git%{?dist}
 License: GPLv2+ and GFDL
 Group: Applications/System
@@ -45,6 +45,9 @@ Requires(post): GConf2
 Requires(preun): GConf2
 Requires(postun): scrollkeeper
 
+# http://git.gnome.org/browse/gnome-power-manager/commit/?id=fdcf156c85c10a6053b7364d882611df07000343
+Patch0: fix-hal-enable-build.patch
+
 %description
 GNOME Power Manager uses the information and facilities provided by HAL
 displaying icons and handling user callbacks in an interactive GNOME session.
@@ -61,12 +64,11 @@ Extra GNOME power management application
 
 %prep
 %setup -q
+%patch0 -p1 -b .hal-build
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
-%configure \
-	--disable-scrollkeeper \
-	--enable-policykit
+%configure --disable-scrollkeeper --enable-hal
 make
 
 # strip unneeded translations from .mo files
@@ -181,6 +183,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/gnome-inhibit-applet.*
 
 %changelog
+* Mon Mar 15 2010 Bastien Nocera <bnocera at redhat.com> 2.29.91-3
+- Really enable HAL build and fix compilation (#572896)
+
 * Thu Mar 11 2010 Bastien Nocera <bnocera at redhat.com> 2.29.91-2
 - Update to 2.29.91
 - Revert HAL removal, or some machines wouldn't have brightness