rpms/NetworkManager/F-11 .cvsignore, 1.111, 1.112 NetworkManager.spec, 1.285, 1.286 nm-applet-internal-buildfixes.patch, 1.13, 1.14 sources, 1.153, 1.154

Daniel Williams dcbw at fedoraproject.org
Wed Feb 3 06:29:35 UTC 2010


Author: dcbw

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

Modified Files:
	.cvsignore NetworkManager.spec 
	nm-applet-internal-buildfixes.patch sources 
Log Message:
* Tue Feb  2 2010 Dan Williams <dcbw at redhat.com> - 0.7.2.995-1.git20100202
- nm: add OLPC mesh device support
- nm: handle /etc/hosts correctly when the hostname is already aliased
- ifcfg-rh: ensure connection is updated when route/key files change




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/.cvsignore,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- .cvsignore	23 Dec 2009 18:20:27 -0000	1.111
+++ .cvsignore	3 Feb 2010 06:29:34 -0000	1.112
@@ -169,3 +169,5 @@ NetworkManager-0.7.2.tar.bz2
 network-manager-applet-0.7.2.tar.bz2
 NetworkManager-0.7.2.git20091223.tar.bz2
 network-manager-applet-0.7.2.git20091223.tar.bz2
+NetworkManager-0.7.2.995.git20100202.tar.bz2
+network-manager-applet-0.7.2.995.git20100202.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/NetworkManager.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- NetworkManager.spec	23 Dec 2009 18:20:27 -0000	1.285
+++ NetworkManager.spec	3 Feb 2010 06:29:34 -0000	1.286
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot .git20091223
-%define applet_snapshot .git20091223
+%define snapshot .git20100202
+%define applet_snapshot .git20100202
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.7.2
-Release: 2%{snapshot}%{?dist}
+Version: 0.7.2.995
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -296,6 +296,7 @@ fi
 %dir %{_sysconfdir}/NetworkManager/system-connections
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
+%{_datadir}/hal/fdi/information/10freedesktop/70-nm-olpc-mesh.fdi
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
 %{_datadir}/PolicyKit/policy/*.policy
 %{udev_scriptdir}/nm-modem-probe
@@ -347,6 +348,11 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Tue Feb  2 2010 Dan Williams <dcbw at redhat.com> - 0.7.2.995-1.git20100202
+- nm: add OLPC mesh device support
+- nm: handle /etc/hosts correctly when the hostname is already aliased
+- ifcfg-rh: ensure connection is updated when route/key files change
+
 * Wed Dec 23 2009 Dan Williams <dcbw at redhat.com> - 0.7.2-2.git20091223
 - nm: allow more connect time for 'hso' mobile broadband devices (rh #514827)
 - nm: fix reconnections on some Option 'hso' devices

nm-applet-internal-buildfixes.patch:
 configure.ac                      |    4 ----
 src/Makefile.am                   |    8 +++++++-
 src/connection-editor/Makefile.am |    9 ++++++++-
 src/gconf-helpers/Makefile.am     |    8 +++++++-
 src/utils/Makefile.am             |    9 ++++++++-
 src/wireless-security/Makefile.am |    8 +++++++-
 6 files changed, 37 insertions(+), 9 deletions(-)

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- nm-applet-internal-buildfixes.patch	23 Dec 2009 18:20:27 -0000	1.13
+++ nm-applet-internal-buildfixes.patch	3 Feb 2010 06:29:35 -0000	1.14
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.2/network-manager-applet-0.7.2/configure.ac.buildfix NetworkManager-0.7.2/network-manager-applet-0.7.2/configure.ac
---- NetworkManager-0.7.2/network-manager-applet-0.7.2/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
-+++ NetworkManager-0.7.2/network-manager-applet-0.7.2/configure.ac	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/configure.ac.buildfix NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/configure.ac
+--- NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/configure.ac.buildfix	2009-04-04 18:03:25.000000000 -0400
++++ NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/configure.ac	2009-04-05 08:31:12.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
@@ -12,9 +12,9 @@ diff -up NetworkManager-0.7.2/network-ma
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
-diff -up NetworkManager-0.7.2/network-manager-applet-0.7.2/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.2/network-manager-applet-0.7.2/src/connection-editor/Makefile.am
---- NetworkManager-0.7.2/network-manager-applet-0.7.2/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
-+++ NetworkManager-0.7.2/network-manager-applet-0.7.2/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/connection-editor/Makefile.am
+--- NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/connection-editor/Makefile.am.buildfix	2009-04-03 09:30:25.000000000 -0400
++++ NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/connection-editor/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -37,9 +37,9 @@ diff -up NetworkManager-0.7.2/network-ma
  
  if NO_POLKIT_GNOME
  nm_connection_editor_LDADD += \
-diff -up NetworkManager-0.7.2/network-manager-applet-0.7.2/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.2/network-manager-applet-0.7.2/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.2/network-manager-applet-0.7.2/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
-+++ NetworkManager-0.7.2/network-manager-applet-0.7.2/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/gconf-helpers/Makefile.am.buildfix	2008-11-26 20:37:43.000000000 -0500
++++ NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/gconf-helpers/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -57,9 +57,9 @@ diff -up NetworkManager-0.7.2/network-ma
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
  
-diff -up NetworkManager-0.7.2/network-manager-applet-0.7.2/src/Makefile.am.buildfix NetworkManager-0.7.2/network-manager-applet-0.7.2/src/Makefile.am
---- NetworkManager-0.7.2/network-manager-applet-0.7.2/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.2/network-manager-applet-0.7.2/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/Makefile.am.buildfix NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/Makefile.am
+--- NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -82,9 +82,9 @@ diff -up NetworkManager-0.7.2/network-ma
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.2/network-manager-applet-0.7.2/src/utils/Makefile.am.buildfix NetworkManager-0.7.2/network-manager-applet-0.7.2/src/utils/Makefile.am
---- NetworkManager-0.7.2/network-manager-applet-0.7.2/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
-+++ NetworkManager-0.7.2/network-manager-applet-0.7.2/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/utils/Makefile.am.buildfix NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/utils/Makefile.am
+--- NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/utils/Makefile.am.buildfix	2008-11-26 20:37:48.000000000 -0500
++++ NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/utils/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -102,9 +102,9 @@ diff -up NetworkManager-0.7.2/network-ma
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
 +
-diff -up NetworkManager-0.7.2/network-manager-applet-0.7.2/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.2/network-manager-applet-0.7.2/src/wireless-security/Makefile.am
---- NetworkManager-0.7.2/network-manager-applet-0.7.2/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
-+++ NetworkManager-0.7.2/network-manager-applet-0.7.2/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
+diff -up NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/wireless-security/Makefile.am
+--- NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/wireless-security/Makefile.am.buildfix	2009-04-04 11:33:58.000000000 -0400
++++ NetworkManager-0.7.2.995/network-manager-applet-0.7.2.995/src/wireless-security/Makefile.am	2009-04-05 08:31:12.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-11/sources,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- sources	23 Dec 2009 18:53:39 -0000	1.153
+++ sources	3 Feb 2010 06:29:35 -0000	1.154
@@ -1,2 +1,2 @@
-24c2a86cfbc27f99e5c5f056787ee497  NetworkManager-0.7.2.git20091223.tar.bz2
-28c86782888b6ae5972b95458839817d  network-manager-applet-0.7.2.git20091223.tar.bz2
+b54253a9ed21e946dd9897f68542bfc9  NetworkManager-0.7.2.995.git20100202.tar.bz2
+6270ff0400d9b9e9fab43998668a26f3  network-manager-applet-0.7.2.995.git20100202.tar.bz2



More information about the scm-commits mailing list