Thu Jun 28 19:28:45 UTC 2007

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31078

Modified Files:
	.cvsignore NetworkManager.spec sources 
Removed Files:
	NetworkManager-0.6.4-startup-dhcdbd.patch 
	NetworkManager-0.6.5-fix-ethernet-link-detection.patch 
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager-0.6.5-wait-for-wireless.patch 
	NetworkManager-0.6.5-wpa_supplicant-debug.patch 
	linkdebug.patch 
	network-manager-applet-0.6.5-fix-eap-key-request.patch 
	network-manager-applet-0.6.5-wso-eap-64bit-fix.patch 
	nm-limited-meshdev-wext.patch nm-no-wpa_supplicant-debug.patch 
	wpas-debugspew.patch 
Log Message:
* Thu Jun 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.5.svn2621
- Update to svn nm-0-6-olpc
    - new automesh behavior
    - kill dhcdbd




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44

--- .cvsignore	15 Jun 2007 02:22:01 -0000	1.43
+++ .cvsignore	28 Jun 2007 19:28:08 -0000	1.44
@@ -1,3 +1,4 @@
 network-manager-applet-0.6.5.tar.bz2
 NetworkManager-0.6.5.tar.bz2
 NetworkManager-0.6.5.svn2546.tar.gz
+NetworkManager-0.6.5.svn2621.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/NetworkManager.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- NetworkManager.spec	15 Jun 2007 02:22:01 -0000	1.150
+++ NetworkManager.spec	28 Jun 2007 19:28:08 -0000	1.151
@@ -8,19 +8,18 @@
 %define gtk2_version	2.6.0
 %define wireless_tools_version 1:28-0pre9
 
+%define svn_revision svn2621
+
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 0.4.svn2546%{?dist}
+Release: 0.5.%{svn_revision}%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}.svn2546.tar.gz
-Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
-Patch1: wpas-wait-longer.patch
-Patch2: nm-no-wpa_supplicant-debug.patch
-Patch3: nm-limited-meshdev-wext.patch
+Source: %{name}-%{version}.%{svn_revision}.tar.gz
+Patch0: wpas-wait-longer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -29,9 +28,10 @@
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: iproute openssl
-Requires: dhcdbd
-Requires: dhclient >= 3.0.2-12
+Requires: dhclient >= 12:3.0.5-36
 Requires: wpa_supplicant
+Requires: dhcp >= 12:3.0.5-36
+Requires: avahi >= 0.6.20-1
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -41,7 +41,6 @@
 BuildRequires: openssl-devel
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
-BuildRequires: dhcdbd
 BuildRequires: wpa_supplicant
 BuildRequires: libnl-devel
 BuildRequires: perl-XML-Parser
@@ -69,10 +68,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .startup-dhcdbd
-%patch1 -p1 -b .wpas-wait-longer
-%patch2 -p1 -b .no-wpa_supplicant-debug
-%patch3 -p1 -b .limited-meshdev-wext
+%patch0 -p1 -b .wpas-wait-longer
 
 %build
 # Even though we don't require named, we still build with it
@@ -134,6 +130,10 @@
 %dir %{_localstatedir}/run/%{name}
 %{_prefix}/libexec/nm-crash-logger
 %{_datadir}/NetworkManager/gdb-cmd
+%{_sysconfdir}/NetworkManager/callouts/nm-avahi-autoipd.action
+%{_sysconfdir}/NetworkManager/callouts/nm-dhcp-client.action
+%config %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
+%config %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
 
 %files devel
 %defattr(-,root,root,0755)
@@ -143,6 +143,11 @@
 
 
 %changelog
+* Thu Jun 28 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.5.svn2621
+- Update to svn nm-0-6-olpc
+    - new automesh behavior
+    - kill dhcdbd
+
 * Thu Jun 14 2007 John (J5) Palmieri <johnp at redhat.com> - 1:0.6.5-0.4.svn2546
 - bump and rebuild into OLPC-2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources	15 Jun 2007 02:22:01 -0000	1.61
+++ sources	28 Jun 2007 19:28:08 -0000	1.62
@@ -1 +1 @@
-ac556d6d23b3a3dfb0ebb6fd828c86e3  NetworkManager-0.6.5.svn2546.tar.gz
+47e2c8f03284483f658e048d7a45fded  NetworkManager-0.6.5.svn2621.tar.gz


--- NetworkManager-0.6.4-startup-dhcdbd.patch DELETED ---


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


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


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


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


--- linkdebug.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 ---


--- nm-limited-meshdev-wext.patch DELETED ---


--- nm-no-wpa_supplicant-debug.patch DELETED ---


--- wpas-debugspew.patch DELETED ---


