rpms/NetworkManager/F-10 NetworkManager-0.7.1-localhost-localdomain.patch, 1.1, 1.2 NetworkManager.spec, 1.258, 1.259

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1852

Modified Files:
	NetworkManager-0.7.1-localhost-localdomain.patch 
	NetworkManager.spec 
Log Message:
Fix patch fuzz

NetworkManager-0.7.1-localhost-localdomain.patch:

Index: NetworkManager-0.7.1-localhost-localdomain.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager-0.7.1-localhost-localdomain.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NetworkManager-0.7.1-localhost-localdomain.patch	5 Mar 2009 10:53:40 -0000	1.1
+++ NetworkManager-0.7.1-localhost-localdomain.patch	5 Mar 2009 11:03:04 -0000	1.2
@@ -1,31 +1,19 @@
-commit 671c232544e109ab0289b6e099274fda54a35dbf
-Author: Dan Williams <dcbw at redhat.com>
-Date:   Thu Feb 19 15:49:37 2009 -0500
-
-    ifcfg-rh: ignore explicitly set 'localhost' hostnames (rh #441453)
-    
-    To match 'network' service behavior, which would perform reverse
-    address lookups when the HOSTNAME from /etc/sysconfig/network
-    was 'localhost' or 'localhost.localdomain'.  Just name your machine
-    already.
-
-diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c
-index e4f5bcf..b673615 100644
---- a/system-settings/plugins/ifcfg-rh/plugin.c
-+++ b/system-settings/plugins/ifcfg-rh/plugin.c
-@@ -499,6 +499,15 @@ plugin_get_hostname (SCPluginIfcfg *plugin)
+diff -up NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c.keep-localhost-localdomain NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c
+--- NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c.keep-localhost-localdomain	2009-03-03 20:13:20.000000000 -0500
++++ NetworkManager-0.7.0.99/system-settings/plugins/ifcfg-rh/plugin.c	2009-03-05 05:59:54.000000000 -0500
+@@ -488,15 +488,6 @@ plugin_get_hostname (SCPluginIfcfg *plug
  
- 	hostname = svGetValue (network, "HOSTNAME");
+ 	hostname = svGetValue (network, "HOSTNAME", FALSE);
  	svCloseFile (network);
-+
-+	/* Ignore a hostname of 'localhost' or 'localhost.localdomain' to preserve
-+	 * 'network' service behavior.
-+	 */
-+	if (hostname && (!strcmp (hostname, "localhost") || !strcmp (hostname, "localhost.localdomain"))) {
-+		g_free (hostname);
-+		hostname = NULL;
-+	}
-+
+-
+-	/* Ignore a hostname of 'localhost' or 'localhost.localdomain' to preserve
+-	 * 'network' service behavior.
+-	 */
+-	if (hostname && (!strcmp (hostname, "localhost") || !strcmp (hostname, "localhost.localdomain"))) {
+-		g_free (hostname);
+-		hostname = NULL;
+-	}
+-
  	return hostname;
  }
  


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- NetworkManager.spec	5 Mar 2009 10:53:40 -0000	1.258
+++ NetworkManager.spec	5 Mar 2009 11:03:04 -0000	1.259
@@ -72,7 +72,7 @@
 BuildRequires: PolicyKit-devel PolicyKit-gnome-devel
 BuildRequires: dhclient
 BuildRequires: gtk-doc
-BuildRequires: libudev-devel
+#BuildRequires: libudev-devel
 
 %description
 NetworkManager attempts to keep an active network connection available at all
@@ -146,7 +146,7 @@
 tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
-%patch3 -p1 -R -b .keep-localhost-localdomain
+%patch3 -p1 -b .keep-localhost-localdomain
 
 %build