rpms/NetworkManager/F-9 old-dbus-glib.patch, NONE, 1.1 NetworkManager.spec, 1.232, 1.233

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30334

Modified Files:
	NetworkManager.spec 
Added Files:
	old-dbus-glib.patch 
Log Message:
Allow use of dbus-glib 0.74 since F9 ships a patched copy

old-dbus-glib.patch:

--- NEW FILE old-dbus-glib.patch ---
diff -up NetworkManager-0.7.0/configure.in.dbusglib NetworkManager-0.7.0/configure.in
--- NetworkManager-0.7.0/configure.in.dbusglib	2008-07-18 14:17:51.000000000 -0400
+++ NetworkManager-0.7.0/configure.in	2008-07-18 14:18:14.000000000 -0400
@@ -170,7 +170,7 @@ if test "$ac_have_iwevgenie" = no; then
 	AC_MSG_ERROR(wireless-tools >= 28pre9 not installed or not functional)
 fi
 
-PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.75)
+PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.74)
 
 ##### Find out the version of DBUS we're using
 dbus_version=`pkg-config --modversion dbus-1`


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- NetworkManager.spec	18 Jul 2008 17:43:23 -0000	1.232
+++ NetworkManager.spec	18 Jul 2008 18:21:23 -0000	1.233
@@ -25,6 +25,7 @@
 Source2: nm-system-settings.conf
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: disable-editing-system-connections-for-now.patch
+Patch3: old-dbus-glib.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -147,6 +148,7 @@
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .disable-system
+%patch3 -p1 -b .old-dbus-glib
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2