From a388b121945a6dd1ab848f5f318fb8d0468c6a3d Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Mon, 26 Nov 2007 20:37:00 +0000
Subject: [PATCH] - Fix device descriptions shown in applet menu
 0.7.0-0.6.5.svn3109 - Fix crash when deactivating VPN connections

---
 .cvsignore          | 27 +++++++++++++++++++++++++++
 NetworkManager.spec | 17 ++++++++++++++---
 sources             |  4 ++--
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4de0ebb..e698bb4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -30,3 +30,30 @@ NetworkManager-0.7.0.svn2981.tar.gz
 nm-applet-0.7.0.svn260.tar.gz
 NetworkManager-0.7.0.svn2983.tar.gz
 nm-applet-0.7.0.svn261.tar.gz
+NetworkManager-0.7.0.svn2994.tar.gz
+nm-applet-0.7.0.svn272.tar.gz
+NetworkManager-0.7.0.svn2995.tar.gz
+nm-applet-0.7.0.svn275.tar.gz
+NetworkManager-0.7.0.svn3008.tar.gz
+nm-applet-0.7.0.svn278.tar.gz
+NetworkManager-0.7.0.svn3014.tar.gz
+nm-applet-0.7.0.svn280.tar.gz
+NetworkManager-0.7.0.svn3016.tar.gz
+nm-applet-0.7.0.svn283.tar.gz
+NetworkManager-0.7.0.svn3020.tar.gz
+nm-applet-0.7.0.svn285.tar.gz
+nm-applet-0.7.0.svn289.tar.gz
+NetworkManager-0.7.0.svn3030.tar.gz
+nm-applet-0.7.0.svn301.tar.gz
+nm-applet-0.7.0.svn302.tar.gz
+NetworkManager-0.7.0.svn3083.tar.gz
+nm-applet-0.7.0.svn346.tar.gz
+NetworkManager-0.7.0.svn3094.tar.gz
+nm-applet-0.7.0.svn353.tar.gz
+NetworkManager-0.7.0.svn3096.tar.gz
+nm-applet-0.7.0.svn360.tar.gz
+nm-applet-0.7.0.svn362.tar.gz
+nm-applet-0.7.0.svn363.tar.gz
+NetworkManager-0.7.0.svn3109.tar.gz
+nm-applet-0.7.0.svn367.tar.gz
+nm-applet-0.7.0.svn368.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 00e8dc1..026efeb 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,18 +7,18 @@ ExcludeArch: s390 s390x
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn3096
+%define snapshot svn3109
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.6.5.%{snapshot}%{?dist}
+Release: 0.6.6.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn363.tar.gz
+Source1: nm-applet-%{version}.svn368.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -171,6 +171,11 @@ popd
 cat nm-applet.lang >> %{name}.lang
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+# Remove system settings daemon for now
+%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-settings-plugin*
+%{__rm} -f $RPM_BUILD_ROOT%{_sbindir}/nm-system-settings
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -261,6 +266,12 @@ fi
 
 
 %changelog
+* Mon Nov 26 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.6.svn3109
+- Fix device descriptions shown in applet menu
+
+* Mon Nov 26 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.5.svn3109
+- Fix crash when deactivating VPN connections
+
 * Mon Nov 19 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.5.svn3096
 - Fix crash and potential infinite nag dialog loop when ignoring CA certificates
 
diff --git a/sources b/sources
index 9b2bd82..572a17e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9a1cf850aff18d808e96000d6a85a463  NetworkManager-0.7.0.svn3096.tar.gz
-b1d9bc824a1c4a39e2313571de8bc28c  nm-applet-0.7.0.svn363.tar.gz
+b94d14d775ade4d969c7c9a6c0c1c887  NetworkManager-0.7.0.svn3109.tar.gz
+3d4b223982a2f4dac3d5a0d5cc864252  nm-applet-0.7.0.svn368.tar.gz