rpms/NetworkManager/F-7 .cvsignore, 1.42, 1.43 NetworkManager.spec, 1.149, 1.150 sources, 1.60, 1.61

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29599

Modified Files:
	.cvsignore NetworkManager.spec sources 
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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-7/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore	20 Apr 2007 03:35:58 -0000	1.42
+++ .cvsignore	21 Jun 2007 14:33:59 -0000	1.43
@@ -1,2 +1,3 @@
 network-manager-applet-0.6.5.tar.bz2
 NetworkManager-0.6.5.tar.bz2
+nm-applet-0.6.5.tar.bz2


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-7/NetworkManager.spec,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- NetworkManager.spec	10 Jun 2007 17:23:32 -0000	1.149
+++ NetworkManager.spec	21 Jun 2007 14:33:59 -0000	1.150
@@ -11,19 +11,15 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 5%{?dist}
+Release: 6%{?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,6 +247,11 @@
 
 
 %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)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-7/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 14:33:59 -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