rpms/NetworkManager/F-9 .cvsignore, 1.85, 1.86 NetworkManager.spec, 1.227, 1.228 explain-dns1-dns2.patch, 1.1, 1.2 sources, 1.114, 1.115 optionally-wait-for-network.patch, 1.2, NONE shutdown-later.patch, 1.1, NONE
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Wed Jun 11 15:37:35 UTC 2008
- Previous message (by thread): rpms/condor/F-9 DetectGCC430.patch,NONE,1.1 condor.spec,1.5,1.6
- Next message (by thread): rpms/gnome-packagekit/devel .cvsignore, 1.20, 1.21 gnome-packagekit.spec, 1.34, 1.35 sources, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv452
Modified Files:
.cvsignore 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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/.cvsignore,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- .cvsignore 14 May 2008 14:12:00 -0000 1.85
+++ .cvsignore 11 Jun 2008 15:36:44 -0000 1.86
@@ -114,3 +114,5 @@
nm-applet-0.7.0.svn724.tar.gz
NetworkManager-0.7.0.svn3667.tar.gz
NetworkManager-0.7.0.svn3669.tar.gz
+NetworkManager-0.7.0.svn3747.tar.gz
+nm-applet-0.7.0.svn755.tar.gz
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- NetworkManager.spec 4 Jun 2008 21:52:20 -0000 1.227
+++ NetworkManager.spec 11 Jun 2008 15:36:44 -0000 1.228
@@ -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/
@@ -25,10 +25,8 @@
Source2: nm-system-settings.conf
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
Patch2: disable-editing-system-connections-for-now.patch
-Patch3: optionally-wait-for-network.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
@@ -100,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
@@ -143,10 +141,8 @@
tar -xzf %{SOURCE1}
%patch1 -p1 -b .buildfix
%patch2 -p1 -b .disable-system
-%patch3 -p1 -b .wait-for-network
%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
@@ -299,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/F-9/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 03:49:33 -0000 1.1
+++ explain-dns1-dns2.patch 11 Jun 2008 15:36:44 -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/F-9/sources,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- sources 19 May 2008 19:32:01 -0000 1.114
+++ sources 11 Jun 2008 15:36:44 -0000 1.115
@@ -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 ---
- Previous message (by thread): rpms/condor/F-9 DetectGCC430.patch,NONE,1.1 condor.spec,1.5,1.6
- Next message (by thread): rpms/gnome-packagekit/devel .cvsignore, 1.20, 1.21 gnome-packagekit.spec, 1.34, 1.35 sources, 1.20, 1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list