rpms/NetworkManager/F-13 NetworkManager.conf, NONE, 1.1 NetworkManager.spec, 1.317, 1.318 nm-applet-internal-buildfixes.patch, 1.26, 1.27 nm-applet-no-notifications.patch, 1.7, 1.8 sources, 1.179, 1.180 nm-system-settings.conf, 1.2, NONE

Daniel Williams dcbw at fedoraproject.org
Thu Jul 22 15:32:23 UTC 2010


Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11028

Modified Files:
	NetworkManager.spec nm-applet-internal-buildfixes.patch 
	nm-applet-no-notifications.patch sources 
Added Files:
	NetworkManager.conf 
Removed Files:
	nm-system-settings.conf 
Log Message:
* Thu Jul 22 2010 Dan Williams <dcbw at redhat.com> - 0.8.1-1
- core: read nm-system-settings.conf before NetworkManager.conf (rh #606160)
- core: fix editing system DSL connections when using keyfile plugin
- core: work around inconsistent proprietary driver associated AP reporting
- core: ensure empty VPN secrets are not used (rh #587784)
- core: don't request WiFi scans when connection is locked to a specific BSSID
- cli: show IPv6 settings and configuration
- applet: updated translations
- editor: fix a PolicyKit-related crash editing connections (rh #603566)
- applet: fix saving the ignore-missing-CA-cert preference (rh #610084)
- editor: fix listing connections on PPC64 (rh #608663)
- editor: ensure editor windows are destroyed when closed (rh #572466)




--- NEW FILE NetworkManager.conf ---
[main]
plugins=ifcfg-rh


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-13/NetworkManager.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -p -r1.317 -r1.318
--- NetworkManager.spec	26 Jun 2010 03:00:05 -0000	1.317
+++ NetworkManager.spec	22 Jul 2010 15:32:22 -0000	1.318
@@ -11,20 +11,20 @@
 
 %define snapshot %{nil}
 %define applet_snapshot %{nil}
-%define realversion 0.8.0.999
+%define realversion 0.8.1
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.1
-Release: 0.4%{snapshot}%{?dist}
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2
-Source2: nm-system-settings.conf
+Source2: NetworkManager.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
 Patch3: nm-applet-no-notifications.patch
@@ -77,7 +77,6 @@ BuildRequires: gtk-doc
 BuildRequires: libudev-devel
 BuildRequires: libuuid-devel
 BuildRequires: libgudev1-devel >= 143
-BuildRequires: cmake
 BuildRequires: desktop-file-utils
 # No bluetooth on s390
 %ifnarch s390 s390x
@@ -307,7 +306,7 @@ fi
 %dir %{_sysconfdir}/%{name}/
 %dir %{_sysconfdir}/%{name}/dispatcher.d
 %dir %{_sysconfdir}/%{name}/VPN
-%config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
+%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
 %{_bindir}/nm-tool
 %{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-client.action
@@ -379,6 +378,22 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Jul 22 2010 Dan Williams <dcbw at redhat.com> - 0.8.1-1
+- core: read nm-system-settings.conf before NetworkManager.conf (rh #606160)
+- core: fix editing system DSL connections when using keyfile plugin
+- core: work around inconsistent proprietary driver associated AP reporting
+- core: ensure empty VPN secrets are not used (rh #587784)
+- core: don't request WiFi scans when connection is locked to a specific BSSID
+- cli: show IPv6 settings and configuration
+- applet: updated translations
+- editor: fix a PolicyKit-related crash editing connections (rh #603566)
+- applet: fix saving the ignore-missing-CA-cert preference (rh #610084)
+- editor: fix listing connections on PPC64 (rh #608663)
+- editor: ensure editor windows are destroyed when closed (rh #572466)
+
+* Thu Jul  1 2010 Matthias Clasen <mclasen at redhatcom> - 0.8.1-0.5
+- Rebuild against new gnome-bluetooth
+
 * Fri Jun 25 2010 Dan Williams <dcbw at redhat.com> - 0.8.1-0.4
 - Update to 0.8.1 release candidate
 - core: fix WWAN hardware enable state tracking (rh #591622)

nm-applet-internal-buildfixes.patch:
 configure.ac                      |    8 +-------
 src/Makefile.am                   |    8 +++++++-
 src/connection-editor/Makefile.am |    9 ++++++++-
 src/gconf-helpers/Makefile.am     |    8 +++++++-
 src/gnome-bluetooth/Makefile.am   |    7 ++++++-
 src/utils/Makefile.am             |    9 ++++++++-
 src/utils/tests/Makefile.am       |    5 ++++-
 src/wireless-security/Makefile.am |    8 +++++++-
 8 files changed, 48 insertions(+), 14 deletions(-)

Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-13/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- nm-applet-internal-buildfixes.patch	26 Jun 2010 03:00:05 -0000	1.26
+++ nm-applet-internal-buildfixes.patch	22 Jul 2010 15:32:23 -0000	1.27
@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/configure.ac	2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac	2009-07-28 13:11:39.261718877 -0400
 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.16
--		 NetworkManager >= 0.8
--		 libnm-glib >= 0.8
--		 libnm-util >= 0.8
--		 libnm-glib-vpn >= 0.8
+-		 NetworkManager >= 0.8.1
+-		 libnm-glib >= 0.8.1
+-		 libnm-util >= 0.8.1
+-		 libnm-glib-vpn >= 0.8.1
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
@@ -17,15 +17,15 @@ diff -up NetworkManager-0.8.0.999/networ
  PKG_CHECK_MODULES(GNOME_BLUETOOTH,
  		  gconf-2.0
 -		  gnome-bluetooth-1.0 >= 2.27.6
--		  libnm-util >= 0.8
--		  libnm-glib >= 0.8,
+-		  libnm-util >= 0.8.1
+-		  libnm-glib >= 0.8.1,
 +		  gnome-bluetooth-1.0 >= 2.27.6,
  		  have_gbt=yes, have_gbt=no)
  AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
  
-diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connection-editor/Makefile.am
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -48,9 +48,9 @@ diff -up NetworkManager-0.8.0.999/networ
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = \
-diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-helpers/Makefile.am
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -68,9 +68,9 @@ diff -up NetworkManager-0.8.0.999/networ
 +	-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.8.0.999/network-manager-applet-0.8.0.999/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
 @@ -6,6 +6,9 @@ INCLUDES = \
  	-I$(top_builddir) \
  	-I${top_builddir}/src/marshallers \
@@ -92,9 +92,9 @@ diff -up NetworkManager-0.8.0.999/networ
  endif
  
  EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.am
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
  
  bin_PROGRAMS = nm-applet
@@ -117,9 +117,9 @@ diff -up NetworkManager-0.8.0.999/networ
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Makefile.am
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,5 +1,9 @@
  SUBDIRS=. tests
  
@@ -139,9 +139,9 @@ diff -up NetworkManager-0.8.0.999/networ
 +	-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.8.0.999/network-manager-applet-0.8.0.999/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/tests/Makefile.am
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,4 +1,7 @@
 -INCLUDES = -I$(top_srcdir)/src/utils
 +INCLUDES = -I$(top_srcdir)/src/utils \
@@ -151,9 +151,9 @@ diff -up NetworkManager-0.8.0.999/networ
  
  noinst_PROGRAMS = test-utils
  
-diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/wireless-security/Makefile.am
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  

nm-applet-no-notifications.patch:
 nm-applet.schemas.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: nm-applet-no-notifications.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-13/nm-applet-no-notifications.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nm-applet-no-notifications.patch	26 Jun 2010 03:00:05 -0000	1.7
+++ nm-applet-no-notifications.patch	22 Jul 2010 15:32:23 -0000	1.8
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/nm-applet.schemas.in.foo NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/nm-applet.schemas.in
---- NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.0.999/network-manager-applet-0.8.0.999/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in.foo NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
 @@ -6,7 +6,7 @@
        <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
        <owner>nm-applet</owner>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-13/sources,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -p -r1.179 -r1.180
--- sources	26 Jun 2010 03:00:05 -0000	1.179
+++ sources	22 Jul 2010 15:32:23 -0000	1.180
@@ -1,2 +1,2 @@
-e7196ecc0e5c15b2da1d79504b776cfa  NetworkManager-0.8.0.999.tar.bz2
-584190b8aecb985d89878c7703110f73  network-manager-applet-0.8.0.999.tar.bz2
+96e551149dda8f6e0a5621f77468ba79  NetworkManager-0.8.1.tar.bz2
+b709808c1a5cfe8236061b5da4907313  network-manager-applet-0.8.1.tar.bz2


--- nm-system-settings.conf DELETED ---



More information about the scm-commits mailing list