rpms/NetworkManager/devel NetworkManager.spec,1.241,1.242

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5352

Modified Files:
	NetworkManager.spec 
Log Message:
* Sat Oct 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4175
- Fix conflicts for older PPTP VPN plugins




Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -r1.241 -r1.242
--- NetworkManager.spec	12 Oct 2008 12:43:44 -0000	1.241
+++ NetworkManager.spec	12 Oct 2008 15:07:23 -0000	1.242
@@ -9,7 +9,7 @@
 %define libnl_version 1.1
 %define ppp_version 2.2.4
 
-%define snapshot svn4174
+%define snapshot svn4175
 %define applet_snapshot svn939
 
 Name: NetworkManager
@@ -42,8 +42,8 @@
 Obsoletes: dhcdbd
 
 Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4174
-Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn4174
 Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4174
+Conflicts: NetworkManager-pptp < 1:0.7.0-0.10.svn4174
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
@@ -296,6 +296,9 @@
 %{_datadir}/gtk-doc/html/libnm-glib/*
 
 %changelog
+* Sat Oct 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4175
+- Fix conflicts for older PPTP VPN plugins
+
 * Sat Oct 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.11.svn4174
 - Ensure that mobile broadband cards are powered up before trying to use them
 - Hostname changing support (rh #441453)