rpms/NetworkManager/devel .cvsignore, 1.83, 1.84 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.20, 1.21 NetworkManager.spec, 1.240, 1.241 explain-dns1-dns2.patch, 1.3, 1.4 sources, 1.118, 1.119 crypto-init.patch, 1.1, NONE nm-param-spec-compare.patch, 1.1, NONE nm-vpn-fixes-r900-r901.patch, 1.1, NONE serial-debug.patch, 1.2, NONE wpa-adhoc-fix.patch, 1.1, NONE

Daniel Williams dcbw at fedoraproject.org
Sun Oct 12 12:44:14 UTC 2008


Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21662

Modified Files:
	.cvsignore 
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager.spec explain-dns1-dns2.patch sources 
Removed Files:
	crypto-init.patch nm-param-spec-compare.patch 
	nm-vpn-fixes-r900-r901.patch serial-debug.patch 
	wpa-adhoc-fix.patch 
Log Message:
* Sat Oct 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4174
- Ensure that mobile broadband cards are powered up before trying to use them
- Hostname changing support (rh #441453)
- Fix mobile broadband secret requests to happen less often
- Better handling of default devices and default routes
- Better information in tooltips and notifications
- Various UI cleanups; hide widgets that aren't used (rh #465397, rh #465395)
- Accept different separators for DNS servers and searches
- Make applet's icon accurately reflect signal strength of the current AP




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .cvsignore	11 Aug 2008 20:37:59 -0000	1.83
+++ .cvsignore	12 Oct 2008 12:43:44 -0000	1.84
@@ -114,3 +114,5 @@
 nm-applet-0.7.0.svn837.tar.gz
 NetworkManager-0.7.0.svn3930.tar.gz
 nm-applet-0.7.0.svn838.tar.gz
+NetworkManager-0.7.0.svn4174.tar.gz
+nm-applet-0.7.0.svn939.tar.gz

NetworkManager-0.6.5-fixup-internal-applet-build.patch:

Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	18 Jul 2008 16:22:44 -0000	1.20
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	12 Oct 2008 12:43:44 -0000	1.21
@@ -1,6 +1,6 @@
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac
 --- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix	2008-06-17 13:51:13.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2008-07-18 11:52:29.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2008-10-12 08:25:08.000000000 -0400
 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
@@ -13,8 +13,8 @@
  		 libglade-2.0
  		 gmodule-export-2.0
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-07-03 07:08:55.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2008-07-18 11:52:29.000000000 -0400
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix	2008-08-11 13:40:26.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2008-10-12 08:25:08.000000000 -0400
 @@ -2,6 +2,10 @@ NULL=
  
  bin_PROGRAMS = nm-connection-editor
@@ -26,7 +26,7 @@
  nm_connection_editor_CPPFLAGS =			\
  	$(NMA_CFLAGS)				\
  	-DICONDIR=\""$(datadir)/icons"\"	\
-@@ -60,7 +64,10 @@ nm_connection_editor_LDADD = \
+@@ -65,7 +69,10 @@ nm_connection_editor_LDADD = \
  	${top_builddir}/src/wireless-security/libwireless-security.la \
  	${top_builddir}/src/utils/libutils.la \
  	$(NMA_LIBS) \
@@ -40,7 +40,7 @@
  glade_DATA = \
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix	2008-05-06 11:16:09.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-07-18 11:52:29.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2008-10-12 08:25:08.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -60,7 +60,7 @@
  
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2008-07-03 08:48:24.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2008-07-18 11:52:29.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2008-10-12 08:25:08.000000000 -0400
 @@ -4,6 +4,10 @@ NULL=
  
  bin_PROGRAMS = nm-applet
@@ -85,7 +85,7 @@
  glade_DATA = applet.glade keyring.png
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix	2008-05-19 11:02:18.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am	2008-07-18 11:52:29.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am	2008-10-12 08:25:09.000000000 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -105,7 +105,7 @@
 +
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix	2008-03-30 13:17:59.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am	2008-07-18 11:52:29.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am	2008-10-12 08:25:09.000000000 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- NetworkManager.spec	1 Oct 2008 21:45:31 -0000	1.240
+++ NetworkManager.spec	12 Oct 2008 12:43:44 -0000	1.241
@@ -9,14 +9,14 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot svn4022
-%define applet_snapshot svn870
+%define snapshot svn4174
+%define applet_snapshot svn939
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.11.%{snapshot}.4%{?dist}
+Release: 0.11.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -24,12 +24,7 @@
 Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
 Source2: nm-system-settings.conf
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch4: serial-debug.patch
-Patch5: explain-dns1-dns2.patch
-Patch6: wpa-adhoc-fix.patch
-Patch7: crypto-init.patch
-Patch8: nm-vpn-fixes-r900-r901.patch
-Patch9: nm-param-spec-compare.patch
+Patch2: explain-dns1-dns2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -46,12 +41,9 @@
 Requires: dnsmasq
 Obsoletes: dhcdbd
 
-# Due to VPN auth-dialog changes in applet r662
-# Due to using prefixes instead of netmasks in NM > r3812
-# Due to consolidation of vpn + vpn-properties settings in NM >= r3927
-# Due to UUID changes in NM >= 4013
-Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4022
-Conflicts: NetworkManager-openvpn < 1:0.7.0-15.svn4022
+Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4174
+Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4174
+Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4174
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -148,12 +140,7 @@
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch4 -p1 -b .serial-debug
-%patch5 -p1 -b .explain-dns1-dns2
-%patch6 -p1 -b .wpa-adhoc-fix
-%patch7 -p1 -b .crypto-init
-%patch8 -p1 -b .vpn-fixes
-%patch9 -p1 -b .paramspec-compare
+%patch2 -p1 -b .explain-dns1-dns2
 
 %build
 autoreconf -i
@@ -281,6 +268,7 @@
 %{_sysconfdir}/dbus-1/system.d/nm-applet.conf
 %{_bindir}/nm-applet
 %{_bindir}/nm-connection-editor
+%{_datadir}/applications/*.desktop
 %{_datadir}/nm-applet/
 %{_datadir}/icons/hicolor/16x16/apps/*.png
 %{_datadir}/icons/hicolor/22x22/apps/*.png
@@ -305,9 +293,19 @@
 %{_libdir}/libnm_glib_vpn.so
 %{_libdir}/libnm-util.so
 %dir %{_datadir}/gtk-doc/html/libnm-glib
-%{_datadir}/gtk-doc/html/libnm-glib/
+%{_datadir}/gtk-doc/html/libnm-glib/*
 
 %changelog
+* Sat Oct 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4174
+- Ensure that mobile broadband cards are powered up before trying to use them
+- Hostname changing support (rh #441453)
+- Fix mobile broadband secret requests to happen less often
+- Better handling of default devices and default routes
+- Better information in tooltips and notifications
+- Various UI cleanups; hide widgets that aren't used (rh #465397, rh #465395)
+- Accept different separators for DNS servers and searches
+- Make applet's icon accurately reflect signal strength of the current AP
+
 * Wed Oct  1 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4022.4
 - Fix connection comparison that could cause changes to get overwritten (rh #464417)
 

explain-dns1-dns2.patch:

Index: explain-dns1-dns2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/explain-dns1-dns2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- explain-dns1-dns2.patch	27 Aug 2008 20:56:34 -0000	1.3
+++ explain-dns1-dns2.patch	12 Oct 2008 12:43:44 -0000	1.4
@@ -1,7 +1,7 @@
 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-08-27 13:20:27.000000000 -0400
-+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c	2008-08-27 16:02:31.000000000 -0400
-@@ -236,7 +236,7 @@ update_resolv_conf (const char *iface,
+--- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2	2008-09-15 10:33:29.000000000 -0400
++++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c	2008-10-12 08:25:48.000000000 -0400
+@@ -243,7 +243,7 @@ write_resolv_conf (FILE *f, const char *
  		g_free (tmp_str);
  	}
  
@@ -9,8 +9,8 @@
 +	if (nameservers && g_strv_length (nameservers)) {
  		GString *str;
  		int num;
- 		int i;
-@@ -259,6 +259,14 @@ update_resolv_conf (const char *iface,
+ 
+@@ -265,6 +265,14 @@ write_resolv_conf (FILE *f, const char *
  		}
  
  		nameservers_str = g_string_free (str, FALSE);
@@ -24,4 +24,4 @@
 +		                                   "# DOMAIN=lab.foo.com bar.foo.com\n");
  	}
  
- 	if (fprintf (f, "%s%s%s\n",
+ 	if (fprintf (f, "%s%s%s",


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/sources,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- sources	27 Aug 2008 20:56:34 -0000	1.118
+++ sources	12 Oct 2008 12:43:44 -0000	1.119
@@ -1,2 +1,2 @@
-4634ada3bfe879592eeda006273e5126  NetworkManager-0.7.0.svn4022.tar.gz
-ea879a8b628afce457e8f3c6b5be409b  nm-applet-0.7.0.svn870.tar.gz
+e68a22872c2eabfb28f5a9678ec048c0  NetworkManager-0.7.0.svn4174.tar.gz
+74161daaa20a15661c62cf8df58740c2  nm-applet-0.7.0.svn939.tar.gz


--- crypto-init.patch DELETED ---


--- nm-param-spec-compare.patch DELETED ---


--- nm-vpn-fixes-r900-r901.patch DELETED ---


--- serial-debug.patch DELETED ---


--- wpa-adhoc-fix.patch DELETED ---




More information about the scm-commits mailing list