From eb14adb4f3fad0ee2ec68287232b8caf72c10f40 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Jun 14 2008 23:06:44 +0000
Subject: add patch to fix dhclient call


---

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 447a7a1..e9824d0 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -14,7 +14,7 @@ Name: NetworkManager
 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 @@ Patch0: wpas-wait-longer.patch
 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 @@ from applications.
 %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 @@ fi
 
 
 %changelog
+* Sat Jun 14 2008 Dennis Gilmore <dennis@ausil.us> - 1:0.6.5-0.10.svn3248
+- apply patch to kill -x option to dhclient
+
 * Mon May 12 2008 Dennis Gilmore <dennis@ausil.us> - 1:0.6.5-0.9.svn3248
 - pull some patches for new libnl from svn  patch some open calls for newer glibc
 
diff --git a/nm-no-x.patch b/nm-no-x.patch
new file mode 100644
index 0000000..09af117
--- /dev/null
+++ b/nm-no-x.patch
@@ -0,0 +1,12 @@
+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);