Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/cockpit.git#3801ae60194f399bc0de1af171b01ed2ba84b41e
This commit is contained in:
parent
beed278452
commit
7081709edf
1
.gitignore
vendored
1
.gitignore
vendored
@ -200,3 +200,4 @@
|
||||
/cockpit-237.tar.xz
|
||||
/cockpit-238.tar.xz
|
||||
/cockpit-238.1.tar.xz
|
||||
/cockpit-239.tar.xz
|
||||
|
27
cockpit.spec
27
cockpit.spec
@ -1,5 +1,5 @@
|
||||
# This spec file has been automatically updated
|
||||
Version: 238.1
|
||||
Version: 239
|
||||
Release: 1%{?dist}
|
||||
#
|
||||
# Copyright (C) 2014-2020 Red Hat, Inc.
|
||||
@ -44,10 +44,6 @@ Release: 1%{?dist}
|
||||
|
||||
%define __lib lib
|
||||
|
||||
%if 0%{?rhel}
|
||||
%define vdo_on_demand 1
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%define pamdir /%{_lib}/security
|
||||
%else
|
||||
@ -159,8 +155,6 @@ exec 2>&1
|
||||
--with-cockpit-user=cockpit-ws \
|
||||
--with-cockpit-ws-instance-user=cockpit-wsinstance \
|
||||
--with-selinux-config-type=etc_t \
|
||||
--with-appstream-data-packages='[ "appstream-data" ]' \
|
||||
--with-nfs-client-package='"nfs-utils"' \
|
||||
%if 0%{?suse_version}
|
||||
--docdir=%_defaultdocdir/%{name} \
|
||||
%endif
|
||||
@ -168,7 +162,7 @@ exec 2>&1
|
||||
%if 0%{?build_basic} == 0
|
||||
--disable-ssh \
|
||||
%endif
|
||||
%{?vdo_on_demand:--with-vdo-package='"vdo"'}
|
||||
|
||||
make -j4 %{?extra_flags} all
|
||||
|
||||
%check
|
||||
@ -498,16 +492,15 @@ getent passwd cockpit-wsinstance >/dev/null || useradd -r -g cockpit-wsinstance
|
||||
|
||||
%post ws
|
||||
%tmpfiles_create cockpit-tempfiles.conf
|
||||
%systemd_post cockpit.socket
|
||||
%systemd_post cockpit.socket cockpit.service
|
||||
# firewalld only partially picks up changes to its services files without this
|
||||
test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
|
||||
|
||||
%preun ws
|
||||
%systemd_preun cockpit.socket
|
||||
%systemd_preun cockpit.socket cockpit.service
|
||||
|
||||
%postun ws
|
||||
%systemd_postun_with_restart cockpit.socket
|
||||
%systemd_postun_with_restart cockpit.service
|
||||
%systemd_postun_with_restart cockpit.socket cockpit.service
|
||||
|
||||
# -------------------------------------------------------------------------------
|
||||
# Sub-packages that are part of cockpit-system in RHEL/CentOS, but separate in Fedora
|
||||
@ -655,7 +648,7 @@ If "virt-install" is installed, you can also create new virtual machines.
|
||||
|
||||
%package -n cockpit-pcp
|
||||
Summary: Cockpit PCP integration
|
||||
Requires: cockpit-bridge >= 134.x
|
||||
Requires: cockpit-bridge >= 238.1.1
|
||||
Requires(post): pcp
|
||||
|
||||
%description -n cockpit-pcp
|
||||
@ -686,6 +679,14 @@ via PackageKit.
|
||||
|
||||
# The changelog is automatically generated and merged
|
||||
%changelog
|
||||
* Wed Mar 03 2021 Martin Pitt <mpitt@redhat.com> - 239-1
|
||||
|
||||
- Terminal: Support for changing the font size
|
||||
- Machines: Allow editing disk cache mode
|
||||
- Logs: Link to related services page
|
||||
- SELinux: Restyle to resemble other pages
|
||||
- Packaging: Removed ./configure options for distribution specific packages
|
||||
|
||||
* Mon Feb 22 2021 Martin Pitt <mpitt@redhat.com> - 238.1-1
|
||||
|
||||
- Several UI alignment fixes
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (cockpit-238.1.tar.xz) = b338a3c797feb573550ead9a1a9382ef8bf96987fa24b366581e10e98ce0c927a9b8aeb8c2bbe9b20952d3cc40236340113e87d1ac51be2f7eca051d091749cd
|
||||
SHA512 (cockpit-239.tar.xz) = 3a38bd031810ccc38990b9a474041675573a37bc0143fedb8a6b9c536cb418f64f80df484786a3a604f3d258dc8a178678c9f38c6f19d2c4d7d75988ac89bc8f
|
||||
|
Loading…
Reference in New Issue
Block a user