diff --git a/NetworkManager.spec b/NetworkManager.spec index f1d808d..8036c47 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,7 +9,7 @@ ExcludeArch: s390 s390x %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 @@ Requires: dnsmasq 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 @@ fi %{_datadir}/gtk-doc/html/libnm-glib/* %changelog +* Sat Oct 11 2008 Dan Williams - 1:0.7.0-0.11.svn4175 +- Fix conflicts for older PPTP VPN plugins + * Sat Oct 11 2008 Dan Williams - 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)