rpms/NetworkManager/devel dbus1.patch, NONE, 1.1 NetworkManager.spec, 1.128, 1.129

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sun Nov 26 01:56:32 UTC 2006


Author: mclasen

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17378

Modified Files:
	NetworkManager.spec 
Added Files:
	dbus1.patch 
Log Message:
fix dbus 1.0 compilation


dbus1.patch:
 NetworkManagerDbus.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE dbus1.patch ---
--- NetworkManager-0.6.4/src/NetworkManagerDbus.c.dbus1	2006-11-25 20:55:16.000000000 -0500
+++ NetworkManager-0.6.4/src/NetworkManagerDbus.c	2006-11-25 20:55:40.000000000 -0500
@@ -831,7 +831,9 @@
 	}
 
 	dbus_error_init (&error);
-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
+#if DBUS_VERSION_MAJOR == 1
+	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;
+#elif (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
 	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;	/* Prohibit replacement is now the default */
 #else
 	flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- NetworkManager.spec	25 Nov 2006 23:27:24 -0000	1.128
+++ NetworkManager.spec	26 Nov 2006 01:56:29 -0000	1.129
@@ -32,6 +32,7 @@
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.cvs20061025.tar.gz
+Patch0: dbus1.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -133,6 +134,7 @@
 
 %prep
 %setup -q -n %{name}-0.6.4
+%patch0 -p1 -b .dbus1
 
 %build
 # Even though we don't require named, we still build with it
@@ -239,6 +241,7 @@
 * Sat Nov 25 2006 Matthias Clasen <mclasen at redhat.com> 
 - Own the /etc/NetworkManager/dispatcher.d directory
 - Require pkgconfig for the -devel packages
+- Fix compilation with dbus 1.0
 
 * Wed Oct 25 2006 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.cvs20061025
 - Update to a stable branch snapshot




More information about the fedora-cvs-commits mailing list