rpms/NetworkManager/F-9 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.18, 1.19 NetworkManager.spec, 1.228, 1.229 sources, 1.115, 1.116

Fri Jul 18 16:17:49 UTC 2008

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6632

Modified Files:
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager.spec sources 
Log Message:
* Fri Jul 18 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.10.svn3830
- Expose server-returned DHCP options via D-Bus
- Use avahi-autoipd rather than old built-in IPv4LL implementation
- Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option)
- Support sending DHCP Client Identifier to DHCP server
- Allow forcing 802.1x PEAP Label to '0'
- Make connection sharing more robust
- Show status for shared and Ad-Hoc connections if no other connection is active

* Fri Jul 11 2008 Matthias Clasen <mclasen at redhat.com> - 1:0.7.0-0.10.svn3801
- Drop explicit hal dep in -gnome

* Wed Jul 02 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.10.svn3801
- Move VPN configuration into connection editor
- Fix mobile broadband username/password issues
- Fix issues with broken rfkill setups (rh #448889)
- Honor APN setting for GSM mobile broadband configurations
- Fix adding CDMA connections in the connection editor



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/F-9/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19

--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	19 May 2008 19:32:01 -0000	1.18
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	18 Jul 2008 16:17:02 -0000	1.19
@@ -1,41 +1,17 @@
 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	2007-11-13 09:53:39.000000000 -0500
 +++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac	2007-11-13 15:14:13.000000000 -0500
-@@ -60,9 +60,6 @@ AC_C_BIGENDIAN
+@@ -60,10 +60,6 @@ AC_C_BIGENDIAN
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.72
  		 glib-2.0 >= 2.10
 -		 NetworkManager >= 0.7.0
--		 libnm_glib
--		 libnm-util
+-		 libnm_glib >= 0.7.0
+-		 libnm-util >= 0.7.0
+-		 libnm_glib_vpn >= 0.7.0
  		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gconf-2.0
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix	2007-09-22 22:54:27.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am	2007-11-13 15:14:13.000000000 -0500
-@@ -1,6 +1,10 @@
- 
- bin_PROGRAMS = nm-vpn-properties
- 
-+INCLUDES = -I${top_srcdir}/../include \
-+           -I${top_srcdir}/../libnm-util \
-+           -I${top_srcdir}/../libnm-glib
-+
- nm_vpn_propertiesdir=$(includedir)/NetworkManager
- 
- nm_vpn_properties_HEADERS = 					\
-@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \
- 
- nm_vpn_properties_LDADD = \
- 	$(NMA_LIBS) \
--	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
-+	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
-+	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
- 
- CLEANFILES = $(server_DATA) *.bak *.gladep *~
- 
 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	2007-10-27 18:23:56.000000000 -0400
 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am	2007-11-13 15:14:13.000000000 -0500
@@ -102,7 +78,7 @@
 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	2007-09-20 07:40:37.000000000 -0400
 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am	2007-11-13 15:14:13.000000000 -0500
-@@ -2,6 +2,10 @@ NULL=
+@@ -2,6 +2,10 @@
  
  bin_PROGRAMS = nm-connection-editor
  
@@ -113,18 +89,18 @@
  nm_connection_editor_CPPFLAGS =			\
  	$(NMA_CFLAGS)				\
  	-DICONDIR=\""$(datadir)/icons"\"	\
-@@ -29,8 +33,10 @@ nm_connection_editor_LDADD = \
- 	$(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
+@@ -59,7 +63,10 @@
  	${top_builddir}/src/wireless-security/libwireless-security.la \
  	${top_builddir}/src/utils/libutils.la \
-	$(NMA_LIBS) \
+ 	$(NMA_LIBS) \
 -	$(POLKIT_LIBS)
 +	$(POLKIT_LIBS) \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \
++	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la
  
  gladedir = $(datadir)/nm-applet
- glade_DATA = nm-connection-editor.gladediff -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
+ glade_DATA = \
 --- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix	2007-10-27 18:11:31.000000000 -0400
 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am	2007-11-13 15:14:13.000000000 -0500
 @@ -4,6 +4,10 @@ NULL=


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/NetworkManager.spec,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- NetworkManager.spec	11 Jun 2008 15:36:44 -0000	1.228
+++ NetworkManager.spec	18 Jul 2008 16:17:02 -0000	1.229
@@ -9,8 +9,8 @@
 %define libnl_version 1.0-0.15.pre8.git20071218
 %define ppp_version 2.2.4
 
-%define snapshot svn3747
-%define applet_snapshot svn755
+%define snapshot svn3830
+%define applet_snapshot svn792
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -39,11 +39,14 @@
 Requires: libnl >= %{libnl_version}
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: ppp >= %{ppp_version}
+Requires: avahi-autoipd
+Requires: dnsmasq
 Obsoletes: dhcdbd
 
 # Due to VPN auth-dialog changes in applet r662
-Conflicts: NetworkManager-vpnc < 1:0.7.0-0.7.7.svn3549
-Conflicts: NetworkManager-openvpn < 1:0.7.0-9.svn3549
+# Due to using prefixes instead of netmasks in NM > r3812
+Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn3830
+Conflicts: NetworkManager-openvpn < 1:0.7.0-11.svn3830
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -97,7 +100,6 @@
 Requires: gnome-panel
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
-Requires: hal >= %{hal_version}
 Requires: libnotify >= 0.4.3
 PreReq:  gtk2 >= %{gtk2_version}
 Requires: gnome-keyring
@@ -114,6 +116,9 @@
 Group: Development/Libraries
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
+# Evil hack for multi-lib due to move of libnm-util from core package to -glib
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: %{name} < %{epoch}:%{version}-0.9.4.svn3675
 
 %description glib
 This package contains the libraries that make it easier to use some NetworkManager
@@ -145,25 +150,20 @@
 %patch5 -p1 -b .explain-dns1-dns2
 
 %build
-# Even though we don't require named, we still build with it
-# so that if the user installs it, NM will use it automatically
 autoreconf -i
 %configure \
 	--disable-static \
-	--with-named=/usr/sbin/named \
-	--with-named-dir=/var/named/data \
-	--with-named-user=named
+	--with-distro=redhat \
+	--with-dhcp-client=dhclient \
+	--with-crypto=nss \
+	--enable-more-warnings=yes
 make
 
 # build the applet
 pushd nm-applet-0.7.0
   autoreconf -i
   intltoolize --force
-  %configure \
-    --disable-static \
-    --with-notify \
-    --with-nss=yes \
-    --with-gnutls=no
+  %configure --disable-static
   make
 popd
  
@@ -173,7 +173,7 @@
 # install NM
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/
+%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 
 # install the applet
 pushd nm-applet-0.7.0
@@ -206,10 +206,12 @@
 %preun
 if [ $1 -eq 0 ]; then
     /sbin/service NetworkManager stop >/dev/null 2>&1
+    killall -TERM nm-system-settings >/dev/null 2>&1
     /sbin/chkconfig --del NetworkManager
 fi
 
 %triggerun -- NetworkManager < 1:0.7.0-0.9.2.svn3614
+/sbin/service NetworkManagerDispatcher stop >/dev/null 2>&1
 /sbin/chkconfig --del NetworkManagerDispatcher
 exit 0
 
@@ -233,18 +235,20 @@
 %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO
 %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
+%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
 %{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf
 %config %{_sysconfdir}/rc.d/init.d/NetworkManager
 %{_sbindir}/%{name}
 %{_sbindir}/nm-system-settings
-%{_sysconfdir}/nm-system-settings.conf
-%dir %{_sysconfdir}/NetworkManager/
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%dir %{_sysconfdir}/NetworkManager/VPN
+%dir %{_sysconfdir}/%{name}/
+%dir %{_sysconfdir}/%{name}/dispatcher.d
+%dir %{_sysconfdir}/%{name}/VPN
+%{_sysconfdir}/%{name}/nm-system-settings.conf
 %{_bindir}/nm-tool
 %{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-client.action
+%{_libexecdir}/nm-avahi-autoipd.action
 %{_libexecdir}/nm-dispatcher.action
 %dir %{_libdir}/NetworkManager
 %{_libdir}/NetworkManager/*.so*
@@ -270,9 +274,7 @@
 %defattr(-,root,root,0755)
 %{_sysconfdir}/dbus-1/system.d/nm-applet.conf
 %{_bindir}/nm-applet
-%{_bindir}/nm-vpn-properties
 %{_bindir}/nm-connection-editor
-%{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade
 %{_datadir}/nm-applet/
 %{_datadir}/icons/hicolor/16x16/apps/*.png
 %{_datadir}/icons/hicolor/22x22/apps/*.png
@@ -289,12 +291,32 @@
 %{_includedir}/libnm-glib/*.h
 %{_includedir}/NetworkManager/nm-*.h
 %{_libdir}/pkgconfig/libnm_glib.pc
+%{_libdir}/pkgconfig/libnm_glib_vpn.pc
 %{_libdir}/pkgconfig/libnm-util.pc
 %{_libdir}/libnm_glib.so
 %{_libdir}/libnm_glib_vpn.so
 %{_libdir}/libnm-util.so
 
 %changelog
+* Fri Jul 18 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.10.svn3830
+- Expose server-returned DHCP options via D-Bus
+- Use avahi-autoipd rather than old built-in IPv4LL implementation
+- Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option)
+- Support sending DHCP Client Identifier to DHCP server
+- Allow forcing 802.1x PEAP Label to '0'
+- Make connection sharing more robust
+- Show status for shared and Ad-Hoc connections if no other connection is active
+
+* Fri Jul 11 2008 Matthias Clasen <mclasen at redhat.com> - 1:0.7.0-0.10.svn3801
+- Drop explicit hal dep in -gnome
+
+* Wed Jul 02 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.10.svn3801
+- Move VPN configuration into connection editor
+- Fix mobile broadband username/password issues
+- Fix issues with broken rfkill setups (rh #448889)
+- Honor APN setting for GSM mobile broadband configurations
+- Fix adding CDMA connections in the connection editor
+
 * Wed Jun 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.10.svn3747
 - Update to latest SVN
 - Enable connection sharing


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-9/sources,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- sources	11 Jun 2008 15:36:44 -0000	1.115
+++ sources	18 Jul 2008 16:17:02 -0000	1.116
@@ -1,2 +1,2 @@
-25a1612c01ec19ba2864ad97ac98c759  NetworkManager-0.7.0.svn3747.tar.gz
-4ae0a5d13783f4de4e4e6f7fb949aaed  nm-applet-0.7.0.svn755.tar.gz
+a65687a0a4003fd7bd8159c00594c484  NetworkManager-0.7.0.svn3830.tar.gz
+31a19503390cd5bce9ff16aace4e6dd4  nm-applet-0.7.0.svn792.tar.gz


