rpms/NetworkManager/devel NetworkManager.spec, 1.224, 1.225 explain-dns1-dns2.patch, 1.1, 1.2 sources, 1.111, 1.112 optionally-wait-for-network.patch, 1.2, NONE shutdown-later.patch, 1.1, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9793

Modified Files:
	NetworkManager.spec explain-dns1-dns2.patch sources 
Removed Files:
	optionally-wait-for-network.patch shutdown-later.patch 
Log Message:
* Wed Jun 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.10.svn3747
- Update to latest SVN
- Enable connection sharing
- Respect VPN-provided routes




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- NetworkManager.spec	5 Jun 2008 15:12:26 -0000	1.224
+++ NetworkManager.spec	11 Jun 2008 16:11:56 -0000	1.225
@@ -9,14 +9,14 @@
 %define libnl_version 1.0-0.15.pre8.git20071218
 %define ppp_version 2.2.4
 
-%define snapshot svn3675
-%define applet_snapshot svn727
+%define snapshot svn3747
+%define applet_snapshot svn755
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.9.4.%{snapshot}%{?dist}
+Release: 0.10.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -24,10 +24,9 @@
 Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
 Source2: nm-system-settings.conf
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch3: optionally-wait-for-network.patch
+Patch2: disable-editing-system-connections-for-now.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
-Patch6: shutdown-later.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -99,7 +98,7 @@
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
-Requires: libnotify >= 0.3
+Requires: libnotify >= 0.4.3
 PreReq:  gtk2 >= %{gtk2_version}
 Requires: gnome-keyring
 Requires: nss >= 3.11.7
@@ -141,10 +140,9 @@
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch3 -p1 -b .wait-for-network
+%patch2 -p1 -b .disable-system
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
-%patch6 -p1 -b .shutdown-later
 
 %build
 # Even though we don't require named, we still build with it
@@ -297,6 +295,11 @@
 %{_libdir}/libnm-util.so
 
 %changelog
+* Wed Jun 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.10.svn3747
+- Update to latest SVN
+- Enable connection sharing
+- Respect VPN-provided routes
+
 * Wed Jun  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.9.4.svn3675
 - Move NM later in the shutdown process (rh #449070)
 - Move libnm-util into a subpackage to allow NM to be removed more easily (rh #351101)

explain-dns1-dns2.patch:

Index: explain-dns1-dns2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/explain-dns1-dns2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- explain-dns1-dns2.patch	30 Apr 2008 19:43:19 -0000	1.1
+++ explain-dns1-dns2.patch	11 Jun 2008 16:11:56 -0000	1.2
@@ -1,21 +1,22 @@
-diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.foo NetworkManager-0.7.0/src/named-manager/nm-named-manager.c
---- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.foo	2008-04-29 23:19:22.000000000 -0400
-+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c	2008-04-29 23:25:10.000000000 -0400
-@@ -385,6 +385,17 @@ rewrite_resolv_conf (NMNamedManager *mgr
- 		/* Using glibc resolver */
- 		char *nameservers = compute_nameservers (composite);
+diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2 NetworkManager-0.7.0/src/named-manager/nm-named-manager.c
+--- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2	2008-05-30 14:39:45.000000000 -0400
++++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c	2008-06-11 08:54:34.000000000 -0400
+@@ -268,6 +268,18 @@ rewrite_resolv_conf (NMNamedManager *mgr
  
-+		if (!nameservers || !strlen (nameservers)) {
-+			g_free (nameservers);
-+			nameservers = g_strdup_printf ("\n\n%s%s%s%s%s%s",
-+			                               "# No nameservers found; try putting DNS servers into your\n",
-+			                               "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
-+			                               "#\n",
-+			                               "# DNS1=xxx.xxx.xxx.xxx\n",
-+			                               "# DNS2=xxx.xxx.xxx.xxx\n",
-+			                               "# SEARCH=lab.foo.com bar.foo.com\n");
-+		}
+ 	/* Using glibc resolver */
+ 	nameservers = compute_nameservers (composite);
 +
- 		if (fprintf (f, "%s%s%s\n",
- 		             domain ? domain : "",
- 		             searches ? searches : "",
++	if (!nameservers || !strlen (nameservers)) {
++		g_free (nameservers);
++		nameservers = g_strdup_printf ("\n\n%s%s%s%s%s%s",
++		                               "# No nameservers found; try putting DNS servers into your\n",
++		                               "# ifcfg files in /etc/sysconfig/network-scripts like so:\n",
++		                               "#\n",
++		                               "# DNS1=xxx.xxx.xxx.xxx\n",
++		                               "# DNS2=xxx.xxx.xxx.xxx\n",
++		                               "# SEARCH=lab.foo.com bar.foo.com\n");
++	}
++
+ 	if (fprintf (f, "%s%s%s\n",
+ 	             domain ? domain : "",
+ 	             searches ? searches : "",


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- sources	19 May 2008 17:46:12 -0000	1.111
+++ sources	11 Jun 2008 16:11:56 -0000	1.112
@@ -1,2 +1,2 @@
-68f70309e5a8c53e73467318199725cc  NetworkManager-0.7.0.svn3675.tar.gz
-82d5aa2ed1942fb419f46895f9817ad2  nm-applet-0.7.0.svn727.tar.gz
+25a1612c01ec19ba2864ad97ac98c759  NetworkManager-0.7.0.svn3747.tar.gz
+4ae0a5d13783f4de4e4e6f7fb949aaed  nm-applet-0.7.0.svn755.tar.gz


--- optionally-wait-for-network.patch DELETED ---


--- shutdown-later.patch DELETED ---