[pm-utils] nm_method.patch: fix dbus methods for NetworkManager calls (part of RH #740342)

[Adam Williamson]

commit eb6912fd6f67191d2cba7e109a6a8992b8e36702
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Jan 20 16:11:59 2012 -0800

    nm_method.patch: fix dbus methods for NetworkManager calls (part of RH #740342)

 pm-utils-1.4.1-nm_method.patch |   39 +++++++++++++++++++++++++++++++++++++++
 pm-utils.spec                  |    9 ++++++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/pm-utils-1.4.1-nm_method.patch b/pm-utils-1.4.1-nm_method.patch
new file mode 100644
index 0000000..3249df2
--- /dev/null
+++ b/pm-utils-1.4.1-nm_method.patch
@@ -0,0 +1,39 @@
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Wed, 2 Nov 2011 09:27:34 +0100
+Subject: Use correct dbus sleep method for NetworkManager
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42500
+Bug-Debian: http://bugs.debian.org/647418
+
+The methods org.freedesktop.NetworkManager.{sleep,wake} have been
+replaced in post-6.x NetworkManager by
+org.freedesktop.NetworkManager.Sleep which takes a boolean argument.
+---
+ pm/sleep.d/55NetworkManager |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pm/sleep.d/55NetworkManager b/pm/sleep.d/55NetworkManager
+index a7fefd5..89cd817 100755
+--- a/pm/sleep.d/55NetworkManager
++++ b/pm/sleep.d/55NetworkManager
+@@ -15,7 +15,7 @@
+ 	dbus_send --system                         \
+ 		--dest=org.freedesktop.NetworkManager  \
+ 		/org/freedesktop/NetworkManager        \
+-		org.freedesktop.NetworkManager.sleep && \
++		org.freedesktop.NetworkManager.Sleep boolean:true && \
+ 	    echo Done. || echo Failed.
+ }
+ 
+@@ -26,7 +26,7 @@
+         dbus_send --system                        \
+ 		--dest=org.freedesktop.NetworkManager \
+ 		/org/freedesktop/NetworkManager       \
+-		org.freedesktop.NetworkManager.wake && \
++		org.freedesktop.NetworkManager.Sleep boolean:false && \
+ 	    echo Done. || echo Failed.
+ }
+
+ 
+-- 
+
diff --git a/pm-utils.spec b/pm-utils.spec
index b540bb0..5238fa7 100644
--- a/pm-utils.spec
+++ b/pm-utils.spec
@@ -5,7 +5,7 @@ Name: pm-utils
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.4.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 %ifnarch s390 s390x
@@ -36,6 +36,8 @@ Patch2: pm-utils-1.4.1-grub2.patch
 Patch3: pm-utils-1.4.1-hook-exit-code-log.patch
 # Fix line spacing in logs to be easier to read (#750755)
 Patch4: pm-utils-1.4.1-log-line-spacing-fix.patch
+# Fix NetworkManager dbus methods (fd.o #42500 / RH #740342)
+Patch5: pm-utils-1.4.1-nm_method.patch
 
 %description
 The pm-utils package contains utilities and scripts useful for tasks related
@@ -60,6 +62,7 @@ tar -xzf %{SOURCE1}
 %patch2 -p1 -b .grub2
 %patch3 -p1 -b .hook-exit-code-log
 %patch4 -p1 -b .log-line-spacing-fix
+%patch5 -p1 -b .nm_method
 
 %build
 %configure --docdir=%{_docdir}/%{name}-%{version}
@@ -123,6 +126,10 @@ rm -rf %{_localstatedir}/run/pm-utils/{pm-suspend,pm-powersave}/storage/*
 %{_libdir}/pkgconfig/pm-utils.pc
 
 %changelog
+* Fri Jan 20 2012 Adam Williamson <awilliam at redhat.com> - 1.4.1-18
+- nm_method.patch: fix dbus methods used to sleep/resume NM
+  (fd.o #42500, RH #740342)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild