Update to cockpit 290 and cockpit-machines 288 upstream releases

Resolves: rhbz#2030836
This commit is contained in:
Martin Pitt 2023-04-20 09:19:50 +02:00
parent 29c9e5d449
commit 4b7920d968
4 changed files with 14 additions and 10 deletions

2
.gitignore vendored
View File

@ -4,3 +4,5 @@ SOURCES/cockpit-machines-284.1.tar.xz
/cockpit-machines-284.1.tar.xz /cockpit-machines-284.1.tar.xz
/cockpit-machines-287.tar.xz /cockpit-machines-287.tar.xz
/cockpit-289.tar.xz /cockpit-289.tar.xz
/cockpit-290.tar.xz
/cockpit-machines-288.tar.xz

View File

@ -28,7 +28,7 @@
# we maintain the basic/optional split, then it can be replaced with just %{version}. # we maintain the basic/optional split, then it can be replaced with just %{version}.
%define required_base 266 %define required_base 266
%define machines_version 287 %define machines_version 288
# we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
%if 0%{?centos} %if 0%{?centos}
@ -51,7 +51,7 @@ Summary: Web Console for Linux servers
License: LGPLv2+ License: LGPLv2+
URL: https://cockpit-project.org/ URL: https://cockpit-project.org/
Version: 289 Version: 290
Release: 1%{?dist} Release: 1%{?dist}
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
Source1: https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_version}.tar.xz Source1: https://github.com/cockpit-project/cockpit-machines/releases/download/%{machines_version}/cockpit-machines-%{machines_version}.tar.xz
@ -157,6 +157,8 @@ Suggests: cockpit-pcp
%if 0%{?rhel} == 0 %if 0%{?rhel} == 0
Recommends: (cockpit-networkmanager if NetworkManager) Recommends: (cockpit-networkmanager if NetworkManager)
# c-ostree is not in RHEL 8/9
Recommends: (cockpit-ostree if rpm-ostree)
Suggests: cockpit-selinux Suggests: cockpit-selinux
%endif %endif
%if 0%{?rhel} && 0%{?centos} == 0 %if 0%{?rhel} && 0%{?centos} == 0
@ -399,10 +401,10 @@ Recommends: (reportd if abrt)
%endif %endif
Provides: bundled(npm(@patternfly/patternfly)) = 4.224.4 Provides: bundled(npm(@patternfly/patternfly)) = 4.224.4
Provides: bundled(npm(@patternfly/react-core)) = 4.276.8 Provides: bundled(npm(@patternfly/react-core)) = 4.276.9
Provides: bundled(npm(@patternfly/react-icons)) = 4.93.6 Provides: bundled(npm(@patternfly/react-icons)) = 4.93.6
Provides: bundled(npm(@patternfly/react-styles)) = 4.92.6 Provides: bundled(npm(@patternfly/react-styles)) = 4.92.7
Provides: bundled(npm(@patternfly/react-table)) = 4.113.0 Provides: bundled(npm(@patternfly/react-table)) = 4.113.1
Provides: bundled(npm(@patternfly/react-tokens)) = 4.94.6 Provides: bundled(npm(@patternfly/react-tokens)) = 4.94.6
Provides: bundled(npm(argparse)) = 1.0.10 Provides: bundled(npm(argparse)) = 1.0.10
Provides: bundled(npm(attr-accept)) = 1.1.3 Provides: bundled(npm(attr-accept)) = 1.1.3
@ -585,7 +587,7 @@ fi
test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
# check for deprecated PAM config # check for deprecated PAM config
if grep --color=auto pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then if test -f %{_sysconfdir}/pam.d/cockpit && grep -q pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then
echo '**** WARNING:' echo '**** WARNING:'
echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a' echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a'
echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.' echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.'

View File

@ -2,7 +2,7 @@ discover:
how: fmf how: fmf
# for machines tests; keep in sync with cockpit-appstream.spec # for machines tests; keep in sync with cockpit-appstream.spec
url: https://github.com/cockpit-project/cockpit-machines url: https://github.com/cockpit-project/cockpit-machines
ref: "287" ref: "288"
execute: execute:
how: tmt how: tmt
@ -11,7 +11,7 @@ execute:
summary: Run Cockpit tests for optional packages summary: Run Cockpit tests for optional packages
discover+: discover+:
url: https://github.com/cockpit-project/cockpit url: https://github.com/cockpit-project/cockpit
ref: "289" ref: "290"
test: /test/browser/optional test: /test/browser/optional
/machines-basic: /machines-basic:

View File

@ -1,2 +1,2 @@
SHA512 (cockpit-machines-287.tar.xz) = 455659ea009986ee73be98c80510c3ef5f770fe907ad048d8be81bdd9f45861845ad80566f63ebdd91440265ed90185546a995029ea4a9ee0f514ae928db3650 SHA512 (cockpit-290.tar.xz) = fb7010cbd247b4a348f28ca86e2e3f74747707ca36d1ba17972864c1f2d3541d814cec7b4c0ff4cf4998a58a906cb4ec2e17e60400888eb4573e177d04c8bb55
SHA512 (cockpit-289.tar.xz) = b8c6fd228c701ca2431b83c19cb11523632294fa80b8c3cfcddc8edee9a2b1a0ee97b2efc2be54e01314cc9604744a3e2dd0c6de3094425abc3a76e1fa02e27f SHA512 (cockpit-machines-288.tar.xz) = d15e7d746c5474cbf52bcf561f2ee5dda0489e9462b1e346cb47acefbf8ce0b0304eac75baa23dbc5f57d6ffd2f2dfcff128714dbf99fa93e57381cceeffff22