Mark file conflict with NetworkManager-strongswan

File /etc/dbus-1/system.d/nm-strongswan-service.conf is now packaged
in strongswan-charon-nm, so older versions of
NetworkManager-strongswan that used to package it need to be marked
as a file conflict.

Fixes BZ#1554479.
This commit is contained in:
Mikhail Zabaluev
2018-08-23 07:34:29 +03:00
parent 9fc9ec766f
commit 2be3ca7a8f

View File

@@ -50,7 +50,8 @@ in userland, using TUN devices and its own IPsec implementation libipsec.
Summary: NetworkManager plugin for Strongswan Summary: NetworkManager plugin for Strongswan
Requires: dbus Requires: dbus
Obsoletes: %{name}-NetworkManager < 0:5.0.4-5 Obsoletes: %{name}-NetworkManager < 0:5.0.4-5
Conflicts: %{name}-NetworkManger < 0:5.0.4-5 Conflicts: %{name}-NetworkManager < 0:5.0.4-5
Conflicts: NetworkManager-strongswan < 1.4.2-1
%description charon-nm %description charon-nm
NetworkManager plugin integrates a subset of Strongswan capabilities NetworkManager plugin integrates a subset of Strongswan capabilities
to NetworkManager. to NetworkManager.