rpms/DeviceKit-power/devel .cvsignore, 1.13, 1.14 DeviceKit-power-port-to-polkit1.patch, 1.1, 1.2 DeviceKit-power.spec, 1.18, 1.19 sources, 1.13, 1.14

Mon Jul 6 12:37:27 UTC 2009

Author: rhughes

Update of /cvs/pkgs/rpms/DeviceKit-power/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3245

Modified Files:
	.cvsignore DeviceKit-power-port-to-polkit1.patch 
	DeviceKit-power.spec sources 
Log Message:
* Mon Jul 06 2009 Richard Hughes <richard at hughsie.com> - 009-1
- Update to 009
- Fixes many problems with multi-battery laptops
- Use pm-powersave like HAL used to
- Fix detecting UPS devices
- Add support for recalled laptop batteries



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14

--- .cvsignore	16 Jun 2009 08:10:11 -0000	1.13
+++ .cvsignore	6 Jul 2009 12:36:57 -0000	1.14
@@ -1 +1 @@
-DeviceKit-power-009-20090616.tar.gz
+DeviceKit-power-009.tar.gz

DeviceKit-power-port-to-polkit1.patch:

Index: DeviceKit-power-port-to-polkit1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power-port-to-polkit1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- DeviceKit-power-port-to-polkit1.patch	16 Jun 2009 10:15:55 -0000	1.1
+++ DeviceKit-power-port-to-polkit1.patch	6 Jul 2009 12:36:57 -0000	1.2
@@ -1,8 +1,8 @@
 diff --git a/configure.ac b/configure.ac
-index 699f3bf..1ac5e3a 100644
+index 042c843..b1cff83 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -143,9 +143,9 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.76])
+@@ -157,9 +157,9 @@ PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.76])
  AC_SUBST(DBUS_GLIB_CFLAGS)
  AC_SUBST(DBUS_GLIB_LIBS)
  
@@ -37,10 +37,10 @@ index 041aae2..df0be71 100644
  	org.freedesktop.devicekit.power.policy.in	\
  	org.freedesktop.devicekit.power.qos.policy.in
 diff --git a/src/Makefile.am b/src/Makefile.am
-index daffad1..2e08a25 100644
+index 14f68de..7f34925 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -19,7 +19,7 @@ INCLUDES = \
+@@ -20,7 +20,7 @@ INCLUDES = \
  	-I$(top_srcdir)						\
  	$(GIO_CFLAGS)						\
  	$(DBUS_GLIB_CFLAGS)					\
@@ -49,7 +49,7 @@ index daffad1..2e08a25 100644
  	$(DEVKIT_CFLAGS)					\
  	$(GLIB_CFLAGS)
  
-@@ -90,7 +90,7 @@ devkit_power_daemon_LDADD = 					\
+@@ -91,7 +91,7 @@ devkit_power_daemon_LDADD =					\
  	$(USB_LIBS)						\
  	$(GIO_LIBS)						\
  	$(DBUS_GLIB_LIBS)					\
@@ -59,10 +59,10 @@ index daffad1..2e08a25 100644
  	$(DEVKIT_LIBS)
  
 diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c
-index de26291..912ad88 100644
+index 895b769..59a6e84 100644
 --- a/src/dkp-daemon.c
 +++ b/src/dkp-daemon.c
-@@ -715,15 +715,15 @@ dkp_daemon_suspend (DkpDaemon *daemon, DBusGMethodInvocation *context)
+@@ -750,15 +750,15 @@ dkp_daemon_suspend (DkpDaemon *daemon, DBusGMethodInvocation *context)
  	gboolean ret;
  	GError *error;
  	GError *error_local = NULL;
@@ -82,7 +82,7 @@ index de26291..912ad88 100644
  		goto out;
  
  	ret = g_spawn_command_line_sync ("/usr/sbin/pm-suspend", &stdout, &stderr, NULL, &error_local);
-@@ -739,8 +739,8 @@ dkp_daemon_suspend (DkpDaemon *daemon, DBusGMethodInvocation *context)
+@@ -774,8 +774,8 @@ dkp_daemon_suspend (DkpDaemon *daemon, DBusGMethodInvocation *context)
  out:
  	g_free (stdout);
  	g_free (stderr);
@@ -93,7 +93,7 @@ index de26291..912ad88 100644
  	return TRUE;
  }
  
-@@ -753,15 +753,15 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
+@@ -788,15 +788,15 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
  	gboolean ret;
  	GError *error;
  	GError *error_local = NULL;
@@ -113,7 +113,7 @@ index de26291..912ad88 100644
  		goto out;
  
  	ret = g_spawn_command_line_sync ("/usr/sbin/pm-hibernate", &stdout, &stderr, NULL, &error_local);
-@@ -777,8 +777,8 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
+@@ -812,8 +812,8 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
  out:
  	g_free (stdout);
  	g_free (stderr);
@@ -138,7 +138,7 @@ index f3492ca..ce4725f 100644
  
  G_BEGIN_DECLS
 diff --git a/src/dkp-device.c b/src/dkp-device.c
-index cd93775..41bfb7a 100644
+index 8ea4060..bf169d8 100644
 --- a/src/dkp-device.c
 +++ b/src/dkp-device.c
 @@ -32,7 +32,6 @@
@@ -150,7 +150,7 @@ index cd93775..41bfb7a 100644
  #include "sysfs-utils.h"
  #include "egg-debug.h"
 diff --git a/src/dkp-device.h b/src/dkp-device.h
-index 15bcea2..55aaf80 100644
+index b85f80d..dec84a4 100644
 --- a/src/dkp-device.h
 +++ b/src/dkp-device.h
 @@ -23,7 +23,7 @@
@@ -163,7 +163,7 @@ index 15bcea2..55aaf80 100644
  #include <dbus/dbus-glib.h>
  
 diff --git a/src/dkp-polkit.c b/src/dkp-polkit.c
-index 101b84a..ca00936 100644
+index 0eb95d9..ca00936 100644
 --- a/src/dkp-polkit.c
 +++ b/src/dkp-polkit.c
 @@ -29,7 +29,6 @@
@@ -238,11 +238,11 @@ index 101b84a..ca00936 100644
  }
  
  /**
-- * gpk_polkit_dbus_filter:
+- * dkp_polkit_dbus_filter:
 + * dkp_polkit_check_auth:
   **/
 -static DBusHandlerResult
--gpk_polkit_dbus_filter (DBusConnection *connection, DBusMessage *message, void *user_data)
+-dkp_polkit_dbus_filter (DBusConnection *connection, DBusMessage *message, void *user_data)
 +gboolean
 +dkp_polkit_check_auth (DkpPolkit *polkit, PolkitSubject *subject, const gchar *action_id, DBusGMethodInvocation *context)
  {
@@ -468,7 +468,7 @@ index 101b84a..ca00936 100644
 -		goto out;
 -	}
 -
--	if (!dbus_connection_add_filter (connection, gpk_polkit_dbus_filter, polkit, NULL)) {
+-	if (!dbus_connection_add_filter (connection, dkp_polkit_dbus_filter, polkit, NULL)) {
 -		egg_warning ("Cannot add D-Bus filter: %s: %s", dbus_error.name, dbus_error.message);
 -		goto out;
 -	}


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/DeviceKit-power.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- DeviceKit-power.spec	16 Jun 2009 10:58:31 -0000	1.18
+++ DeviceKit-power.spec	6 Jul 2009 12:36:57 -0000	1.19
@@ -9,13 +9,13 @@
 Summary: Power Management Service
 Name: DeviceKit-power
 Version: 009
-Release: 0.4.%{?alphatag}git%{?dist}
-#Release: 1%{?dist}
+#Release: 0.4.%{?alphatag}git%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://gitweb.freedesktop.org/?p=users/david/DeviceKit.git;a=summary
-Source0:   http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
-#Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
+#Source0:   http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
+Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # from upstream polkit1 branch, automatically generated
@@ -58,14 +58,12 @@ Requires: %{name} = %{version}-%{release
 Headers and libraries for DeviceKit-power.
 
 %prep
-#%setup -q
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
 %patch0 -p1 -b .polkit1
 
 # we messed about with configure.ac and Makefile.am, so regenerate (due to polkit1 patch)
-aclocal
-autoconf
-automake
+autoreconf
 
 %build
 %configure
@@ -102,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/DeviceKit-power/devkit-power-gobject
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 %{_sysconfdir}/dbus-1/system.d/*.conf
-%{_sysconfdir}/udev/rules.d/*.rules
+/lib/udev/rules.d/*.rules
 %dir %{_localstatedir}/lib/DeviceKit-power
 %{_bindir}/*
 %{_libexecdir}/*
@@ -123,8 +121,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jul 06 2009 Richard Hughes <richard at hughsie.com> - 009-1
+- Update to 009
+- Fixes many problems with multi-battery laptops
+- Use pm-powersave like HAL used to
+- Fix detecting UPS devices
+- Add support for recalled laptop batteries
+
 * Tue Jun 16 2009 Richard Hughes  <rhughes at redhat.com> - 009-0.4.20090616git
-- Do aclocal as well due to different values of automake on koji.
+- Do autoreconf as well due to different values of automake on koji.
 
 * Tue Jun 16 2009 Richard Hughes  <rhughes at redhat.com> - 009-0.3.20090616git
 - Do autoconf and automake as the polkit patch is pretty invasive


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	16 Jun 2009 08:10:11 -0000	1.13
+++ sources	6 Jul 2009 12:36:57 -0000	1.14
@@ -1 +1 @@
-5e1fa469f6ad582e54272e1252db0311  DeviceKit-power-009-20090616.tar.gz
+535703fa7b9c323d6388b5aff28cfeeb  DeviceKit-power-009.tar.gz


