From 61abc258664301cfe8f2098601d3098a393bc077 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Mar 15 2010 11:34:20 +0000
Subject: - Really enable HAL build and fix compilation (#572896)


---

diff --git a/fix-hal-enable-build.patch b/fix-hal-enable-build.patch
new file mode 100644
index 0000000..09c7cdf
--- /dev/null
+++ b/fix-hal-enable-build.patch
@@ -0,0 +1,18 @@
+commit fdcf156c85c10a6053b7364d882611df07000343
+Author: Chris Coulson <chrisccoulson@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;
diff --git a/gnome-power-manager.spec b/gnome-power-manager.spec
index 911e634..82d895f 100644
--- a/gnome-power-manager.spec
+++ b/gnome-power-manager.spec
@@ -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 applications that are not normally needed.
 
 %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@redhat.com> 2.29.91-3
+- Really enable HAL build and fix compilation (#572896)
+
 * Thu Mar 11 2010 Bastien Nocera <bnocera@redhat.com> 2.29.91-2
 - Update to 2.29.91
 - Revert HAL removal, or some machines wouldn't have brightness