[NetworkManager/f15/master] Fix applet bus name

[Daniel Williams]

commit 2b6b60f84833981462bff420dff09b11ddb89eaf
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Mar 9 11:56:40 2011 -0600

    Fix applet bus name

 NetworkManager.spec      |   13 +++++++++----
 nm-applet-bus-name.patch |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 911e3c8..8f24968 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -20,7 +20,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.995
-Release: 2%{snapshot}%{?dist}
+Release: 3%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -31,14 +31,15 @@ Source2: NetworkManager.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
 Patch3: nm-applet-no-notifications.patch
+Patch4: nm-applet-bus-name.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
 %if %{use_systemd}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): /bin/systemctl
+Requires(preun): /bin/systemctl
+Requires(postun): /bin/systemctl
 %endif
 
 Requires: dbus >= %{dbus_version}
@@ -168,6 +169,7 @@ tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
 %patch3 -p1 -b .no-notifications
+%patch4 -p1 -b .applet-bus-name
 
 %build
 
@@ -433,6 +435,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Mar  9 2011 Dan Williams <dcbw at redhat.com> - 0.8.995-3.git20110308
+- applet: fix bus name
+
 * Tue Mar  8 2011 Matthias Clasen <mclasen at redhat.com> - 0.8.995-2.git20110308
 - Fix systemd requires
 
diff --git a/nm-applet-bus-name.patch b/nm-applet-bus-name.patch
new file mode 100644
index 0000000..804a35a
--- /dev/null
+++ b/nm-applet-bus-name.patch
@@ -0,0 +1,21 @@
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c.foo NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c.foo	2011-03-09 11:49:55.791538667 -0600
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c	2011-03-09 11:50:10.646352961 -0600
+@@ -3104,7 +3104,7 @@ dbus_setup (NMApplet *applet, GError **e
+ 		return FALSE;
+ 
+ 	dbus_g_connection_register_g_object (applet->session_bus,
+-	                                     "/org/gnome/network-manager-applet",
++	                                     "/org/gnome/network_manager_applet",
+ 	                                     G_OBJECT (applet));
+ 
+ 	proxy = dbus_g_proxy_new_for_name (applet->session_bus,
+@@ -3112,7 +3112,7 @@ dbus_setup (NMApplet *applet, GError **e
+ 	                                   DBUS_PATH_DBUS,
+ 	                                   DBUS_INTERFACE_DBUS);
+ 	success = dbus_g_proxy_call (proxy, "RequestName", error,
+-	                             G_TYPE_STRING, "org.gnome.network-manager-applet",
++	                             G_TYPE_STRING, "org.gnome.network_manager_applet",
+ 	                             G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE,
+ 	                             G_TYPE_INVALID,
+ 	                             G_TYPE_UINT, &result,