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#917966bcedaf571eb6fc5c796c057636b85cdc73
This commit is contained in:
DistroBaker 2021-01-08 13:43:32 +00:00
parent 0946428ae9
commit 6a2f1be9c8
3 changed files with 13 additions and 5 deletions

1
.gitignore vendored
View File

@ -195,3 +195,4 @@
/cockpit-233.tar.xz
/cockpit-233.1.tar.xz
/cockpit-234.tar.xz
/cockpit-235.tar.xz

View File

@ -1,5 +1,5 @@
# This spec file has been automatically updated
Version: 234
Version: 235
Release: 1%{?dist}
#
# Copyright (C) 2014-2020 Red Hat, Inc.
@ -254,6 +254,9 @@ find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
echo '%dir %{_datadir}/cockpit/playground' > tests.list
find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list
echo '%dir %{_datadir}/cockpit/static' > static.list
find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
# when not building basic packages, remove their files
%if 0%{?build_basic} == 0
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do
@ -416,7 +419,7 @@ Obsoletes: cockpit-networkmanager
Requires: NetworkManager >= 1.6
Provides: cockpit-kdump = %{version}-%{release}
Requires: kexec-tools
Recommends: polkit
Recommends: (sudo or polkit)
Recommends: PackageKit
Recommends: NetworkManager-team
Recommends: setroubleshoot-server >= 3.3.3
@ -459,7 +462,7 @@ The Cockpit Web Service listens on the network, and authenticates users.
If sssd-dbus is installed, you can enable client certificate/smart card
authentication via sssd/FreeIPA.
%files ws -f cockpit.lang
%files ws -f cockpit.lang -f static.list
%doc %{_mandir}/man1/cockpit-desktop.1.gz
%doc %{_mandir}/man5/cockpit.conf.5.gz
%doc %{_mandir}/man8/cockpit-ws.8.gz
@ -498,7 +501,6 @@ authentication via sssd/FreeIPA.
%{_libexecdir}/cockpit-tls
%{_libexecdir}/cockpit-desktop
%attr(4750, root, cockpit-wsinstance) %{_libexecdir}/cockpit-session
%{_datadir}/cockpit/static
%{_datadir}/cockpit/branding
%pre ws
@ -696,6 +698,11 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
* Thu Jan 07 2021 Martin Pitt <mpitt@redhat.com> - 235-1
- Login: Improved handling of SSH host keys
- Overview: Editable motd
* Wed Dec 09 2020 Marius Vollmer <mvollmer@redhat.com> - 234-1
- machines: Allow editing VM's CPU mode and model
- machines: Add support for cloning VMs

View File

@ -1 +1 @@
SHA512 (cockpit-234.tar.xz) = 2bb0cd547972262d26f57d8262d5eedfa6362d8a27b7f5e994e95c895a7197c536b4e428ab9d78ab78800aace8d63221ac2fa6d22282301a1e28bc59808254ff
SHA512 (cockpit-235.tar.xz) = 709b35fdeded99ec353f14e0fc5a5412fb5a8013dfb9d405e47386d9031a19354fa9941d3e57cfe5528f38a8ae98acd0a8dedd62835d185e83b064db9735aebf