rpms/DeviceKit-power/F-12 encrypted-swap.patch, NONE, 1.1 DeviceKit-power.spec, 1.25, 1.26

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/DeviceKit-power/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31157

Modified Files:
	DeviceKit-power.spec 
Added Files:
	encrypted-swap.patch 
Log Message:
Fix hibernate


encrypted-swap.patch:
 dkp-daemon.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE encrypted-swap.patch ---
diff -up DeviceKit-power-012/src/dkp-daemon.c.hibernate DeviceKit-power-012/src/dkp-daemon.c
--- DeviceKit-power-012/src/dkp-daemon.c.hibernate	2009-10-28 22:36:07.452756570 -0400
+++ DeviceKit-power-012/src/dkp-daemon.c	2009-10-28 22:37:05.067756671 -0400
@@ -563,7 +563,7 @@ dkp_daemon_hibernate (DkpDaemon *daemon,
 	}
 
 	/* encrypted swap? */
-	if (!daemon->priv->hibernate_has_encrypted_swap) {
+	if (daemon->priv->hibernate_has_encrypted_swap) {
 		error = g_error_new (DKP_DAEMON_ERROR,
 				     DKP_DAEMON_ERROR_GENERAL,
 				     "Swap space is encrypted");


Index: DeviceKit-power.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-power/F-12/DeviceKit-power.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- DeviceKit-power.spec	19 Oct 2009 10:29:59 -0000	1.25
+++ DeviceKit-power.spec	29 Oct 2009 02:44:19 -0000	1.26
@@ -9,7 +9,7 @@ Summary: Power Management Service
 Name: DeviceKit-power
 Version: 012
 #Release: 0.1.%{?alphatag}git%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/
@@ -37,6 +37,9 @@ Requires: polkit >= %{polkit_version}
 Requires: udev
 Requires: pm-utils >= 1.2.2.1
 
+# make hibernate work again
+Patch0: encrypted-swap.patch
+
 %description
 DeviceKit-power provides a daemon, API and command line tools for
 managing power devices attached to the system.
@@ -51,6 +54,8 @@ Headers and libraries for DeviceKit-powe
 
 %prep
 %setup -q
+%patch0 -p1 -b .encrypted-swap
+
 #%setup -q -n %{?name}-%{?version}-%{?alphatag}
 
 %build
@@ -109,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/DeviceKit-power/devkit-power-gobject/*.h
 
 %changelog
+* Wed Oct 28 2009 Matthias Clasen <mclasen at redhat.com> - 012-2
+- Make hibernate work again
+
 * Mon Oct 19 2009 Richard Hughes <richard at hughsie.com> - 012-1
 - Update to 012
 - Detect encrypted swap and prevent hibernate in this case.