rpms/cockpit
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Drop firewalld service

Browse Source 
This moved into firewalld-0.6.0-1.el8+7, so stop shipping it and add a
versioned conflicts instead, to force the package manager to upgrade
cockpit and firewalld in lockstep.

rhbz#1609393
This commit is contained in:
Martin Pitt 2018-07-28 11:49:48 +02:00
parent d7544c8b68
commit c565b9af88
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cockpit.spec
View File

@ -1,6 +1,6 @@
# This spec file has been automatically updated # This spec file has been automatically updated
Version: 173 Version: 173
Release: 1%{?dist} Release: 2%{?dist}
# #
# This file is maintained at the following location: # This file is maintained at the following location:
# https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec # https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
@ -174,6 +174,7 @@ make install-tests DESTDIR=%{buildroot}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
rm -f %{buildroot}/%{_libdir}/cockpit/*.so rm -f %{buildroot}/%{_libdir}/cockpit/*.so
rm -f %{buildroot}/%{_prefix}/%{__lib}/firewalld/services/cockpit.xml
install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/ install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
# On RHEL we don't yet show options for changing language # On RHEL we don't yet show options for changing language
@ -465,6 +466,7 @@ Summary: Cockpit Web Service
Requires: glib-networking Requires: glib-networking
Requires: openssl Requires: openssl
Requires: glib2 >= 2.37.4 Requires: glib2 >= 2.37.4
Conflicts: firewalld < 0.6.0-1
%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
Recommends: sscg >= 2.3 Recommends: sscg >= 2.3
%endif %endif
@ -489,7 +491,6 @@ The Cockpit Web Service listens on the network, and authenticates users.
%{_unitdir}/cockpit.service %{_unitdir}/cockpit.service
%{_unitdir}/cockpit-motd.service %{_unitdir}/cockpit-motd.service
%{_unitdir}/cockpit.socket %{_unitdir}/cockpit.socket
%{_prefix}/%{__lib}/firewalld/services/cockpit.xml
%{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf %{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf
%{_sbindir}/remotectl %{_sbindir}/remotectl
%{_libdir}/security/pam_ssh_add.so %{_libdir}/security/pam_ssh_add.so
@ -814,6 +815,10 @@ via PackageKit.
# The changelog is automatically generated and merged # The changelog is automatically generated and merged
%changelog %changelog
* Sat Jul 28 2018 Martin Pitt <martin@piware.de> - UNRELEASED
- Drop firewalld service (moved to firewalld), add corresponding conflict
rhbz#1609393
* Wed Jul 25 2018 Martin Pitt <martin@piware.de> - 173-1 * Wed Jul 25 2018 Martin Pitt <martin@piware.de> - 173-1
- Storage: Offer installation of VDO - Storage: Offer installation of VDO