From 2be3ca7a8f384d0a62246235e931399c6a105ac6 Mon Sep 17 00:00:00 2001
From: Mikhail Zabaluev <mikhail.zabaluev@gmail.com>
Date: Thu, 23 Aug 2018 07:34:29 +0300
Subject: [PATCH] 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.
---
 strongswan.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/strongswan.spec b/strongswan.spec
index f9e257c..aad3c11 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -50,7 +50,8 @@ in userland, using TUN devices and its own IPsec implementation libipsec.
 Summary:        NetworkManager plugin for Strongswan
 Requires:       dbus
 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
 NetworkManager plugin integrates a subset of Strongswan capabilities
 to NetworkManager.