rpms/ypbind/devel ypbind-mt-1.20.4-signalstate.patch, NONE, 1.1 ypbind.spec, 1.64, 1.65

[Karel Klíč]

Author: kklic

Update of /cvs/extras/rpms/ypbind/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18058/devel

Modified Files:
	ypbind.spec 
Added Files:
	ypbind-mt-1.20.4-signalstate.patch 
Log Message:
added signalstate patch, fixes compilation with NetworkManaged-devel headers installed. Resolves #537064 (F-12, devel)


ypbind-mt-1.20.4-signalstate.patch:
 ypbind_dbus_nm.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE ypbind-mt-1.20.4-signalstate.patch ---
diff -up ypbind-mt-1.20.4/src/ypbind_dbus_nm.c.signalstate ypbind-mt-1.20.4/src/ypbind_dbus_nm.c
--- ypbind-mt-1.20.4/src/ypbind_dbus_nm.c.signalstate	2009-11-13 12:32:30.639389786 +0100
+++ ypbind-mt-1.20.4/src/ypbind_dbus_nm.c	2009-11-13 12:34:30.429263750 +0100
@@ -34,11 +34,12 @@
 
 #ifdef HAVE_NETWORKMANAGER_NETWORKMANAGER_H
 #include <NetworkManager/NetworkManager.h>
+#include <NetworkManager/NetworkManagerVPN.h>
 #else
 #define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
 #define NM_DBUS_SERVICE   "org.freedesktop.NetworkManager"
 #define NM_DBUS_PATH      "/org/freedesktop/NetworkManager"
-#define NM_DBUS_SIGNAL_STATE_CHANGE "StateChange"
+#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
 
 typedef enum NMState {
   NM_STATE_UNKNOWN = 0,
@@ -138,7 +139,7 @@ dbus_filter (DBusConnection *connection,
       handled = DBUS_HANDLER_RESULT_HANDLED;
     }
   else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE,
-                                   NM_DBUS_SIGNAL_STATE_CHANGE))
+                                   NM_DBUS_VPN_SIGNAL_STATE_CHANGE))
     {
       NMState state = NM_STATE_UNKNOWN;
 


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- ypbind.spec	29 Oct 2009 08:15:38 -0000	1.64
+++ ypbind.spec	13 Nov 2009 14:39:28 -0000	1.65
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.29.91
-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
@@ -9,7 +9,10 @@ Url: http://www.linux-nis.org/nis/ypbind
 Source1: ypbind.init
 Source2: nis.sh
 Patch1: ypbind-1.11-gettextdomain.patch
+# Sent to upstream. No response.
 Patch2: ypbind-mt-1.29.91-man-port.patch
+# Sent to upstream. Fixes bug #537064.
+Patch3: ypbind-mt-1.20.4-signalstate.patch
 
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -43,6 +46,7 @@ also need to install the ypserv package 
 %setup -q -n ypbind-mt-%{version}
 %patch1 -p1 -b .gettextdomain
 %patch2 -p1 -b .man-port
+%patch3 -p1 -b .signalstate
 
 %build
 %configure --sbindir=/sbin
@@ -87,6 +91,10 @@ fi
 %doc README NEWS
 
 %changelog
+* Fri Nov 19 2009 Karel Klic <kklic at redhat.com> - 3:1.29.91-2
+- Added signalstate patch, which fixes compilation with
+  NetworkManaged-devel headers installed. Resolves #537064.
+
 * Mon Oct 26 2009 Karel Klic <kklic at redhat.com> - 3:1.29.91-1
 - Updated to 1.29.91 from upstream
 - Removed 1.19-port-leak patch because the upstream source code has