rpms/NetworkManager/devel .cvsignore, 1.71, 1.72 NetworkManager.spec, 1.209, 1.210 sources, 1.99, 1.100

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32266

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Wed Apr  9 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.9.1.svn3549
- Fix issues with VPN passwords not getting found




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore	8 Apr 2008 21:30:20 -0000	1.71
+++ .cvsignore	10 Apr 2008 03:54:04 -0000	1.72
@@ -91,3 +91,5 @@
 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


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- NetworkManager.spec	8 Apr 2008 21:30:20 -0000	1.209
+++ NetworkManager.spec	10 Apr 2008 03:54:04 -0000	1.210
@@ -9,8 +9,8 @@
 %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: 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 @@
 %{__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 @@
 %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 @@
 
 
 %changelog
+* Wed Apr  9 2008 Dan Williams <dcbw at 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 at redhat.com> - 1:0.7.0-0.9.1.svn3548
 - Fix builds due to glib2 breakage of GStaticMutex with gcc 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/sources,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- sources	8 Apr 2008 21:30:20 -0000	1.99
+++ sources	10 Apr 2008 03:54:04 -0000	1.100
@@ -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