rpms/NetworkManager/devel NetworkManager.spec,1.249,1.250

[Daniel Williams]

Author: dcbw

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

Modified Files:
	NetworkManager.spec 
Log Message:
Update conflicts with older VPN plugins


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- NetworkManager.spec	22 Nov 2008 02:55:12 -0000	1.249
+++ NetworkManager.spec	22 Nov 2008 03:01:07 -0000	1.250
@@ -44,7 +44,7 @@
 
 Conflicts: NetworkManager-vpnc < 1:0.7.0-0.11.svn4326
 Conflicts: NetworkManager-openvpn < 1:0.7.0-16.svn4326
-Conflicts: NetworkManager-pptp < 1:0.7.0-0.11.svn4326
+Conflicts: NetworkManager-pptp < 1:0.7.0-0.12.svn4326
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}