rpms/firewalld
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add Conflicts for cockpit-ws

Browse Source 
The service definition moved from cockpit to firewalld.
This commit is contained in:
Eric Garver 2018-07-29 09:39:37 -04:00
parent cb592bb50d
commit 0a594a0f04
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firewalld.spec
View File

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