From 72b0042fa8fb8ade295c4dd4f4d3eca8d6fb6275 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Tue, 8 Apr 2008 19:27:32 +0000
Subject: [PATCH] - Fix WEP key index handling in UI - Fix handling of
 NM_CONTROLLED in ifcfg files - Show device managed state in applet menu -
 Show wireless enabled state in applet menu - Better handling of default DHCP
 connections for wired devices - Fix loading of connection editor on KDE (rh
 #435344)

---
 .cvsignore          |  2 ++
 NetworkManager.spec | 13 +++++++++++--
 sources             |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 58fd4d2..7a71217 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -88,3 +88,5 @@ NetworkManager-0.7.0.svn3521.tar.gz
 nm-applet-0.7.0.svn636.tar.gz
 NetworkManager-0.7.0.svn3527.tar.gz
 nm-applet-0.7.0.svn645.tar.gz
+NetworkManager-0.7.0.svn3547.tar.gz
+nm-applet-0.7.0.svn657.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 92e754f..403dd98 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,8 +9,8 @@ ExcludeArch: s390 s390x
 %define libnl_version 1.0-0.15.pre8.git20071218
 %define ppp_version 2.2.4
 
-%define snapshot svn3527
-%define applet_snapshot svn645
+%define snapshot svn3547
+%define applet_snapshot svn657
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -254,6 +254,7 @@ fi
 %{_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
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
@@ -279,6 +280,14 @@ fi
 
 
 %changelog
+* Tue Apr  8 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3547
+- Fix WEP key index handling in UI
+- Fix handling of NM_CONTROLLED in ifcfg files
+- Show device managed state in applet menu
+- Show wireless enabled state in applet menu
+- Better handling of default DHCP connections for wired devices
+- Fix loading of connection editor on KDE (rh #435344)
+
 * Wed Apr  2 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3527
 - Honor MAC address locking for wired & wireless devices
 
diff --git a/sources b/sources
index 7e174fd..f0466ff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2c076621548e735a68285e7de7b4bfca  NetworkManager-0.7.0.svn3527.tar.gz
-887070e1cca22b4c1f2ad8fd3c198714  nm-applet-0.7.0.svn645.tar.gz
+2df414b5ee67f1e660503bfd4f5c927c  NetworkManager-0.7.0.svn3547.tar.gz
+4d6200f8722278cfbcc7d3e7f3eddc06  nm-applet-0.7.0.svn657.tar.gz