[ypbind/f16] NetworkManager signal name changed Resolves: #812501

[Honza Horak]

commit 25e85721f4acfa2b660b670642d00ef8912eeda4
Author: Honza Horák <hhorak at redhat.com>
Date:   Wed Apr 18 14:46:52 2012 +0200

    NetworkManager signal name changed
    Resolves: #812501

 ypbind-mt-1.35-nmsignal.patch |   30 ++++++++++++++++++++++++++++++
 ypbind.spec                   |    8 +++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/ypbind-mt-1.35-nmsignal.patch b/ypbind-mt-1.35-nmsignal.patch
new file mode 100644
index 0000000..5c27683
--- /dev/null
+++ b/ypbind-mt-1.35-nmsignal.patch
@@ -0,0 +1,30 @@
+diff -up ypbind-mt-1.35/src/ypbind_dbus_nm.c.nmsignal ypbind-mt-1.35/src/ypbind_dbus_nm.c
+--- ypbind-mt-1.35/src/ypbind_dbus_nm.c.nmsignal	2012-03-23 13:48:21.000000000 +0100
++++ ypbind-mt-1.35/src/ypbind_dbus_nm.c	2012-04-18 14:40:50.574569893 +0200
+@@ -32,6 +32,9 @@
+ #include <dbus/dbus-glib-lowlevel.h>
+ #include <dbus/dbus-glib.h>
+ 
++/* We have our own constant, NM uses directly "StateChanged" string */
++#define NM_DBUS_SIGNAL_STATE_CHANGED "StateChanged"
++
+ #ifdef HAVE_NETWORKMANAGER_NETWORKMANAGER_H
+ #include <NetworkManager/NetworkManager.h>
+ #include <NetworkManager/NetworkManagerVPN.h>
+@@ -39,7 +42,6 @@
+ #define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
+ #define NM_DBUS_SERVICE   "org.freedesktop.NetworkManager"
+ #define NM_DBUS_PATH      "/org/freedesktop/NetworkManager"
+-#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
+ 
+ typedef enum NMState {
+ 	NM_STATE_UNKNOWN          = 0,
+@@ -160,7 +162,7 @@ dbus_filter (DBusConnection *connection,
+       handled = DBUS_HANDLER_RESULT_HANDLED;
+     }
+   else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE,
+-                                   NM_DBUS_VPN_SIGNAL_STATE_CHANGE))
++                                   NM_DBUS_SIGNAL_STATE_CHANGED))
+     {
+       NMState state = NM_STATE_UNKNOWN;
+ 
diff --git a/ypbind.spec b/ypbind.spec
index fe6f9a5..f4b3cb3 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.35
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -17,6 +17,7 @@ Patch1: ypbind-1.11-gettextdomain.patch
 # Not sent to upstream.
 Patch2: ypbind-mt-1.32-typo.patch
 Patch3: ypbind-mt-1.32-typo2.patch
+Patch4: ypbind-mt-1.35-nmsignal.patch
 # This is for /bin/systemctl
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -52,6 +53,7 @@ also need to install the ypserv package to a machine on your network.
 %patch1 -p1 -b .gettextdomain
 %patch2 -p1 -b .typo
 %patch3 -p1 -b .typo2
+%patch4 -p1 -b .nmsignal
 
 %build
 %configure --enable-dbus-nm
@@ -113,6 +115,10 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Wed Apr 18 2012 Honza Horak <hhorak at redhat.com> - 3:1.35-2
+- NetworkManager signal name changed
+  Resolves: #812501
+
 * Mon Mar 26 2012 Honza Horak <hhorak at redhat.com> - 3:1.35-1
 - Update to new version with only minor changes