rpms/NetworkManager/OLPC-3 nm-no-x.patch, NONE, 1.1 NetworkManager.spec, 1.225, 1.226

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/extras/rpms/NetworkManager/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12441

Modified Files:
	NetworkManager.spec 
Added Files:
	nm-no-x.patch 
Log Message:
add patch to fix dhclient call


nm-no-x.patch:

--- NEW FILE nm-no-x.patch ---
Index: NetworkManager-0.6.5/src/dhcp-manager/nm-dhcp-manager.c
===================================================================
--- NetworkManager-0.6.5.orig/src/dhcp-manager/nm-dhcp-manager.c
+++ NetworkManager-0.6.5/src/dhcp-manager/nm-dhcp-manager.c
@@ -586,7 +586,6 @@ dhclient_run (NMDHCPDevice *device, gcha
 	g_ptr_array_add (dhclient_argv, (gpointer) (*dhclient_binary));
 
 	g_ptr_array_add (dhclient_argv, (gpointer) "-d");
-	g_ptr_array_add (dhclient_argv, (gpointer) "-x");
 
 	if (xtra_arg != NULL)
 		g_ptr_array_add (dhclient_argv, (gpointer) xtra_arg);


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-3/NetworkManager.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- NetworkManager.spec	12 May 2008 19:13:32 -0000	1.225
+++ NetworkManager.spec	14 Jun 2008 23:06:44 -0000	1.226
@@ -14,7 +14,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 0.9.%{svn_revision}%{?dist}
+Release: 0.10.%{svn_revision}%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -24,6 +24,7 @@
 patch1: NetworkManager-0.6.5-glibc-open.patch
 Patch2: NetworkManager-0.6.5-3206-edit.patch
 Patch3: 3307.patch
+Patch4: nm-no-x.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -79,6 +80,7 @@
 %patch1 -p1 -b .open
 %patch2 -p1 -b .commit3206
 %patch3 -p2 -b .commit3307
+%patch4 -p1 -b .no-x
 
 %build
 # Even though we don't require named, we still build with it
@@ -163,6 +165,9 @@
 
 
 %changelog
+* Sat Jun 14 2008 Dennis Gilmore <dennis at ausil.us> - 1:0.6.5-0.10.svn3248
+- apply patch to kill -x option to dhclient
+
 * Mon May 12 2008 Dennis Gilmore <dennis at ausil.us> - 1:0.6.5-0.9.svn3248
 - pull some patches for new libnl from svn  patch some open calls for newer glibc