rpms/NetworkManager/devel NetworkManager.spec, 1.150, 1.151 sources, 1.60, 1.61 NetworkManager-0.6.5-fix-ethernet-link-detection.patch, 1.1, NONE NetworkManager-0.6.5-wait-for-wireless.patch, 1.1, NONE NetworkManager-0.6.5-wpa_supplicant-debug.patch, 1.1, NONE network-manager-applet-0.6.5-fix-eap-key-request.patch, 1.1, NONE network-manager-applet-0.6.5-wso-eap-64bit-fix.patch, 1.1, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10587

Modified Files:
	NetworkManager.spec sources 
Removed Files:
	NetworkManager-0.6.5-fix-ethernet-link-detection.patch 
	NetworkManager-0.6.5-wait-for-wireless.patch 
	NetworkManager-0.6.5-wpa_supplicant-debug.patch 
	network-manager-applet-0.6.5-fix-eap-key-request.patch 
	network-manager-applet-0.6.5-wso-eap-64bit-fix.patch 
Log Message:
* Thu Jun 21 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-6
- Update to stable branch snapshot:
    - More fixes for ethernet link detection (gnome #354565, rh #194124)
    - Support for HAL-detected rfkill switches



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- NetworkManager.spec	10 Jun 2007 17:26:11 -0000	1.150
+++ NetworkManager.spec	21 Jun 2007 15:11:09 -0000	1.151
@@ -11,19 +11,15 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 6%{?dist}
+Release: 6.1%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.tar.bz2
-Source1: network-manager-applet-%{version}.tar.bz2
+Source1: nm-applet-%{version}.tar.bz2
 Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: NetworkManager-0.6.5-fix-ethernet-link-detection.patch
-Patch3: NetworkManager-0.6.5-wait-for-wireless.patch
-Patch4: network-manager-applet-0.6.5-fix-eap-key-request.patch
-Patch5: network-manager-applet-0.6.5-wso-eap-64bit-fix.patch
-Patch6: linkdebug.patch
+Patch2: linkdebug.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -122,15 +118,11 @@
 %prep
 %setup -q
 %patch0 -p1 -b .startup-dhcdbd
-%patch2 -p0 -b .fix-ethernet-link-detection
-%patch3 -p0 -b .wait-for-wireless
-%patch6 -p1 -b .linkdebug
+%patch2 -p1 -b .linkdebug
 
 # unpack the applet
 tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch4 -p1 -b .fix-eap-key-request
-%patch5 -p1 -b .wso-eap-64bit-fix
 
 %build
 # Even though we don't require named, we still build with it
@@ -255,22 +247,24 @@
 
 
 %changelog
+* Thu Jun 21 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-6
+- Update to stable branch snapshot:
+    - More fixes for ethernet link detection (gnome #354565, rh #194124)
+    - Support for HAL-detected rfkill switches
+
 * Sun Jun 10 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-5
 - Fix applet crash on 64-bit platforms when choosing
     "Connect to other wireless network..." (gnome.org #435036)
 - Add debug output for ethernet device link changes
 
-* Thu Jun  7 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-5
+* Thu Jun  7 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-4
 - Fix ethernet link detection (gnome #354565, rh #194124)
 - Fix perpetual credentials request with private key passwords in the applet
 - Sleep a bit before activating wireless cards to work around driver bugs
 
-* Mon Jun  4 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-4
+* Mon Jun  4 2007 Dan Williams <dcbw at redhat.com> 1:0.6.5-3
 - Don't spawn wpa_supplicant with -o
 
-* Wed May 23 2007 Christopher Aillon <caillon at redhat.com> 1:0.6.5-3
-- Rebuild
-
 * Wed Apr 25 2007 Christopher Aillon <caillon at redhat.com> 1:0.6.5-2
 - Fix requires macro (237806)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	20 Apr 2007 03:35:58 -0000	1.60
+++ sources	21 Jun 2007 15:11:09 -0000	1.61
@@ -1,2 +1,2 @@
-b827d300eb28458f6588eb843cba418d  NetworkManager-0.6.5.tar.bz2
-1c94a41e2399d261985a75f0cd3b895b  network-manager-applet-0.6.5.tar.bz2
+5f9161b0f3c0011b7f44bd0a7321e7c0  NetworkManager-0.6.5.tar.bz2
+a629a8e2e90f7e1eb9cfd3fba35d7113  nm-applet-0.6.5.tar.bz2


--- NetworkManager-0.6.5-fix-ethernet-link-detection.patch DELETED ---


--- NetworkManager-0.6.5-wait-for-wireless.patch DELETED ---


--- NetworkManager-0.6.5-wpa_supplicant-debug.patch DELETED ---


--- network-manager-applet-0.6.5-fix-eap-key-request.patch DELETED ---


--- network-manager-applet-0.6.5-wso-eap-64bit-fix.patch DELETED ---