Add Conflicts for cockpit-ws

The service definition moved from cockpit to firewalld.

firewalld.spec

@@ -1,7 +1,7 @@
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
 Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL:     http://www.firewalld.org
 License: GPLv2+
 Source0: https://github.com/firewalld/firewalld/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -32,6 +32,7 @@ Requires: firewalld-filesystem = %{version}-%{release}
 Requires: python3-firewall  = %{version}-%{release}
 Obsoletes: firewalld-selinux < 0.4.4.2-2
 Conflicts: selinux-policy < 3.14.1-28
+Conflicts: cockpit-ws < 173-2
 
 Provides: variant_config(Server)
 Provides: variant_config(Workstation)
@@ -269,6 +270,9 @@ fi
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Sun Jul 29 2018 Eric Garver <egarver@redhat.com> - 0.6.0-2
+- Add conflicts for cockpit-ws due to cockpit service definition, rhbz #1609393
+
 * Thu Jul 19 2018 Eric Garver <egarver@redhat.com> - 0.6.0-1
 - rebase package to v0.6.0
 - simplify spec file