- Fix conflicts for older PPTP VPN plugins

This commit is contained in:
Daniel Williams 2008-10-12 15:07:23 +00:00
parent c9bde83e4c
commit 838ebf32f4
1 changed files with 5 additions and 2 deletions

View File

@ -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
@ -41,9 +41,9 @@ Requires: avahi-autoipd
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 <dcbw@redhat.com> - 1:0.7.0-0.11.svn4175
- Fix conflicts for older PPTP VPN plugins
* Sat Oct 11 2008 Dan Williams <dcbw@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)