rpms/NetworkManager/OLPC-2 .cvsignore, 1.45, 1.46 NetworkManager.spec, 1.153, 1.154 sources, 1.63, 1.64

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Tue Jul  3 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.8.svn2626
- Update to svn nm-0-6-olpc
    - Make anycast addresses configurable though /etc/NetworkManager/anycast.conf
    - Fix manual reactivation of the mesh device to start at step 1
    - Make sure dhclient is stopped before switching mesh channels




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	2 Jul 2007 20:17:06 -0000	1.45
+++ .cvsignore	3 Jul 2007 22:13:57 -0000	1.46
@@ -3,3 +3,4 @@
 NetworkManager-0.6.5.svn2546.tar.gz
 NetworkManager-0.6.5.svn2621.tar.gz
 NetworkManager-0.6.5.svn2624.tar.gz
+NetworkManager-0.6.5.svn2626.tar.gz


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/NetworkManager.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- NetworkManager.spec	2 Jul 2007 20:17:06 -0000	1.153
+++ NetworkManager.spec	3 Jul 2007 22:13:57 -0000	1.154
@@ -8,13 +8,13 @@
 %define gtk2_version	2.6.0
 %define wireless_tools_version 1:28-0pre9
 
-%define svn_revision svn2624
+%define svn_revision svn2626
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 0.7.%{svn_revision}%{?dist}
+Release: 0.8.%{svn_revision}%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -29,10 +29,18 @@
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
 Requires: iproute openssl
-Requires: dhclient >= 12:3.0.5-36
 Requires: wpa_supplicant
+
+# OLPC-2 Requires
 Requires: dhcp >= 12:3.0.5-36
+Requires: dhclient >= 12:3.0.5-36
 Requires: avahi >= 0.6.20-1
+Requires: avahi-autoipd >= 0.6.20-1
+
+# olpc-1 Requires
+#Requires: dhcp > 12:3.0.5-4
+#Requires: dhclient > 12:3.0.5-4
+#Requires: avahi > 0.6.16-4
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -154,6 +162,12 @@
 
 
 %changelog
+* Tue Jul  3 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.8.svn2626
+- Update to svn nm-0-6-olpc
+    - Make anycast addresses configurable though /etc/NetworkManager/anycast.conf
+    - Fix manual reactivation of the mesh device to start at step 1
+    - Make sure dhclient is stopped before switching mesh channels
+
 * Mon Jul  2 2007 Dan Williams <dcbw at redhat.com> - 1:0.6.5-0.7.svn2624
 - Update to svn nm-0-6-olpc
     - Let wired devices activate first


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/OLPC-2/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources	2 Jul 2007 20:17:06 -0000	1.63
+++ sources	3 Jul 2007 22:13:57 -0000	1.64
@@ -1 +1 @@
-f7ecd076ff73a5fc94f2f1d8c8d4e001  NetworkManager-0.6.5.svn2624.tar.gz
+31acc425f2a7e06a6088e0160d1e307b  NetworkManager-0.6.5.svn2626.tar.gz