rpms/NetworkManager/F-8 .cvsignore, 1.69, 1.70 NetworkManager.spec, 1.194, 1.195 sources, 1.88, 1.89

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4461

Modified Files:
	.cvsignore NetworkManager.spec sources 
Log Message:
* Mon Nov 26 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.5.svn3109
- Fix crash when deactivating VPN connections




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	19 Nov 2007 22:22:52 -0000	1.69
+++ .cvsignore	26 Nov 2007 17:30:50 -0000	1.70
@@ -54,3 +54,5 @@
 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


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- NetworkManager.spec	19 Nov 2007 22:22:52 -0000	1.194
+++ NetworkManager.spec	26 Nov 2007 17:30:50 -0000	1.195
@@ -7,7 +7,7 @@
 %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
@@ -18,7 +18,7 @@
 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}.svn367.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 @@
 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,9 @@
 
 
 %changelog
+* Mon Nov 26 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.5.svn3109
+- Fix crash when deactivating VPN connections
+
 * Mon Nov 19 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.5.svn3096
 - Fix crash and potential infinite nag dialog loop when ignoring CA certificates
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- sources	19 Nov 2007 22:22:52 -0000	1.88
+++ sources	26 Nov 2007 17:30:50 -0000	1.89
@@ -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
+db88d4ec224aafb089d102462bdc5324  nm-applet-0.7.0.svn367.tar.gz