From 0ec7b9d1b98353669d283cae847c45792a76026e Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Apr 10 2008 03:54:04 +0000
Subject: - Fix issues with VPN passwords not getting found


---

diff --git a/.cvsignore b/.cvsignore
index 832e765..7380b5b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -91,3 +91,5 @@ nm-applet-0.7.0.svn645.tar.gz
 NetworkManager-0.7.0.svn3547.tar.gz
 nm-applet-0.7.0.svn657.tar.gz
 NetworkManager-0.7.0.svn3548.tar.gz
+NetworkManager-0.7.0.svn3549.tar.gz
+nm-applet-0.7.0.svn662.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 55e4473..e6241f8 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 svn3548
-%define applet_snapshot svn657
+%define snapshot svn3549
+%define applet_snapshot svn662
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -40,6 +40,10 @@ Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: ppp >= %{ppp_version}
 Obsoletes: dhcdbd
 
+# Due to VPN auth-dialog changes in applet r662
+Conflicts: NetworkManager-vpnc < 1:0.7.0-0.7.7.svn3549
+Conflicts: NetworkManager-openvpn < 1:0.7.0-9.svn3549
+
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
@@ -183,6 +187,8 @@ cat nm-applet.lang >> %{name}.lang
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
 
+install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -233,6 +239,7 @@ fi
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
 %dir %{_sysconfdir}/NetworkManager/VPN
 %{_bindir}/nm-tool
+%{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-client.action
 %{_libdir}/libnm-util.so*
 %dir %{_libdir}/NetworkManager
@@ -280,6 +287,9 @@ fi
 
 
 %changelog
+* Wed Apr  9 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3549
+- Fix issues with VPN passwords not getting found
+
 * Tue Apr  8 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3548
 - Fix builds due to glib2 breakage of GStaticMutex with gcc 4.3
 
diff --git a/sources b/sources
index ce209c3..7ae100f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4d6200f8722278cfbcc7d3e7f3eddc06  nm-applet-0.7.0.svn657.tar.gz
-2b363549f0cd2300b81c1f52a799b1dd  NetworkManager-0.7.0.svn3548.tar.gz
+126323fb50af92c634899c45d53f8596  NetworkManager-0.7.0.svn3549.tar.gz
+75614d7d309c713defdb81d5c8288871  nm-applet-0.7.0.svn662.tar.gz