Update to cockpit 303 and cockpit-machines 300 upstream releases

Resolves: jira#RHEL-2218
This commit is contained in:
Martin Pitt 2023-10-19 10:53:37 +02:00
parent b9d32419b6
commit 1b7bd81591
3 changed files with 41 additions and 28 deletions

View File

@ -28,7 +28,7 @@
# we maintain the basic/optional split, then it can be replaced with just %{version}.
%define required_base 266
%define machines_version 299
%define machines_version 300
# we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
%if 0%{?centos}
@ -51,7 +51,7 @@ Summary: Web Console for Linux servers
License: LGPL-2.1-or-later
URL: https://cockpit-project.org/
Version: 301
Version: 303
Release: 1%{?dist}
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
@ -229,8 +229,10 @@ echo '%dir %{_datadir}/cockpit/base1' >> base.list
find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
%if 0%{?enable_old_bridge} && 0%{?build_basic}
echo '%dir %{_datadir}/cockpit/ssh' >> base.list
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
%endif
echo '%{_libexecdir}/cockpit-ssh' >> base.list
echo '%dir %{_datadir}/cockpit/pcp' > pcp.list
@ -281,7 +283,7 @@ 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 users metrics; do
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport static systemd users metrics; do
rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml
done
@ -290,7 +292,7 @@ for data in doc man pixmaps polkit-1; do
done
rm -r %{buildroot}/%{_prefix}/%{__lib}/tmpfiles.d
find %{buildroot}/%{_unitdir}/ -type f ! -name 'cockpit-session*' -delete
for libexec in cockpit-askpass cockpit-beiboot cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
for libexec in cockpit-askpass cockpit-session cockpit-ws cockpit-tls cockpit-wsinstance-factory cockpit-client cockpit-client.ui cockpit-desktop cockpit-certificate-helper cockpit-certificate-ensure; do
rm -f %{buildroot}/%{_libexecdir}/$libexec
done
rm -r %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
@ -381,7 +383,6 @@ system on behalf of the web based user interface.
%{_libexecdir}/cockpit-askpass
%if 0%{?enable_old_bridge} == 0
%{python3_sitelib}/%{name}*
%{_libexecdir}/cockpit-beiboot
%endif
%package doc
@ -431,25 +432,28 @@ Provides: cockpit-sosreport = %{version}-%{release}
Recommends: (reportd if abrt)
%endif
Provides: bundled(npm(@patternfly/patternfly)) = 5.0.4
Provides: bundled(npm(@patternfly/react-core)) = 5.0.1
Provides: bundled(npm(@patternfly/react-icons)) = 5.0.1
Provides: bundled(npm(@patternfly/react-styles)) = 5.0.1
Provides: bundled(npm(@patternfly/react-table)) = 5.0.1
Provides: bundled(npm(@patternfly/react-tokens)) = 5.0.1
Provides: bundled(npm(@babel/runtime)) = 7.23.2
Provides: bundled(npm(@patternfly/patternfly)) = 5.1.0
Provides: bundled(npm(@patternfly/react-core)) = 5.1.1
Provides: bundled(npm(@patternfly/react-icons)) = 5.1.1
Provides: bundled(npm(@patternfly/react-styles)) = 5.1.1
Provides: bundled(npm(@patternfly/react-table)) = 5.1.1
Provides: bundled(npm(@patternfly/react-tokens)) = 5.1.1
Provides: bundled(npm(argparse)) = 1.0.10
Provides: bundled(npm(array-buffer-byte-length)) = 1.0.0
Provides: bundled(npm(attr-accept)) = 2.2.2
Provides: bundled(npm(autolinker)) = 3.16.2
Provides: bundled(npm(available-typed-arrays)) = 1.0.5
Provides: bundled(npm(call-bind)) = 1.0.2
Provides: bundled(npm(date-fns)) = 2.22.1
Provides: bundled(npm(deep-equal)) = 2.0.5
Provides: bundled(npm(define-properties)) = 1.2.0
Provides: bundled(npm(date-fns)) = 2.30.0
Provides: bundled(npm(deep-equal)) = 2.2.2
Provides: bundled(npm(define-data-property)) = 1.1.1
Provides: bundled(npm(define-properties)) = 1.2.1
Provides: bundled(npm(es-get-iterator)) = 1.1.3
Provides: bundled(npm(file-selector)) = 0.6.0
Provides: bundled(npm(focus-trap)) = 7.4.3
Provides: bundled(npm(focus-trap)) = 7.5.2
Provides: bundled(npm(for-each)) = 0.3.3
Provides: bundled(npm(function-bind)) = 1.1.1
Provides: bundled(npm(function-bind)) = 1.1.2
Provides: bundled(npm(functions-have-names)) = 1.2.3
Provides: bundled(npm(get-intrinsic)) = 1.2.1
Provides: bundled(npm(gopd)) = 1.0.1
@ -458,9 +462,10 @@ Provides: bundled(npm(has-property-descriptors)) = 1.0.0
Provides: bundled(npm(has-proto)) = 1.0.1
Provides: bundled(npm(has-symbols)) = 1.0.3
Provides: bundled(npm(has-tostringtag)) = 1.0.0
Provides: bundled(npm(has)) = 1.0.3
Provides: bundled(npm(has)) = 1.0.4
Provides: bundled(npm(internal-slot)) = 1.0.5
Provides: bundled(npm(is-arguments)) = 1.1.1
Provides: bundled(npm(is-array-buffer)) = 3.0.2
Provides: bundled(npm(is-bigint)) = 1.0.4
Provides: bundled(npm(is-boolean-object)) = 1.1.2
Provides: bundled(npm(is-callable)) = 1.2.7
@ -469,19 +474,21 @@ Provides: bundled(npm(is-map)) = 2.0.2
Provides: bundled(npm(is-number-object)) = 1.0.7
Provides: bundled(npm(is-regex)) = 1.1.4
Provides: bundled(npm(is-set)) = 2.0.2
Provides: bundled(npm(is-shared-array-buffer)) = 1.0.2
Provides: bundled(npm(is-string)) = 1.0.7
Provides: bundled(npm(is-symbol)) = 1.0.4
Provides: bundled(npm(is-typed-array)) = 1.1.12
Provides: bundled(npm(is-weakmap)) = 2.0.1
Provides: bundled(npm(is-weakset)) = 2.0.2
Provides: bundled(npm(isarray)) = 2.0.5
Provides: bundled(npm(js-sha1)) = 0.6.0
Provides: bundled(npm(js-sha256)) = 0.9.0
Provides: bundled(npm(js-sha256)) = 0.10.1
Provides: bundled(npm(js-tokens)) = 4.0.0
Provides: bundled(npm(json-stable-stringify-without-jsonify)) = 1.0.1
Provides: bundled(npm(lodash)) = 4.17.21
Provides: bundled(npm(loose-envify)) = 1.4.0
Provides: bundled(npm(object-assign)) = 4.1.1
Provides: bundled(npm(object-inspect)) = 1.12.3
Provides: bundled(npm(object-inspect)) = 1.13.0
Provides: bundled(npm(object-is)) = 1.1.5
Provides: bundled(npm(object-keys)) = 1.1.1
Provides: bundled(npm(object.assign)) = 4.1.4
@ -490,21 +497,23 @@ Provides: bundled(npm(react-dom)) = 18.2.0
Provides: bundled(npm(react-dropzone)) = 14.2.3
Provides: bundled(npm(react-is)) = 16.13.1
Provides: bundled(npm(react)) = 18.2.0
Provides: bundled(npm(regexp.prototype.flags)) = 1.5.0
Provides: bundled(npm(regenerator-runtime)) = 0.14.0
Provides: bundled(npm(regexp.prototype.flags)) = 1.5.1
Provides: bundled(npm(remarkable)) = 2.0.1
Provides: bundled(npm(scheduler)) = 0.23.0
Provides: bundled(npm(set-function-name)) = 2.0.1
Provides: bundled(npm(side-channel)) = 1.0.4
Provides: bundled(npm(sprintf-js)) = 1.0.3
Provides: bundled(npm(stop-iteration-iterator)) = 1.0.0
Provides: bundled(npm(tabbable)) = 6.2.0
Provides: bundled(npm(throttle-debounce)) = 2.3.0
Provides: bundled(npm(throttle-debounce)) = 5.0.0
Provides: bundled(npm(tslib)) = 2.6.2
Provides: bundled(npm(uuid)) = 7.0.3
Provides: bundled(npm(uuid)) = 9.0.1
Provides: bundled(npm(which-boxed-primitive)) = 1.0.2
Provides: bundled(npm(which-collection)) = 1.0.1
Provides: bundled(npm(which-typed-array)) = 1.1.11
Provides: bundled(npm(xterm-addon-canvas)) = 0.3.0
Provides: bundled(npm(xterm)) = 5.1.0
Provides: bundled(npm(xterm-addon-canvas)) = 0.5.0
Provides: bundled(npm(xterm)) = 5.3.0
%description system
This package contains the Cockpit shell and system configuration interfaces.
@ -817,6 +826,10 @@ via PackageKit.
# The changelog is automatically generated and merged
%changelog
* Thu Oct 19 2023 Martin Pitt <mpitt@redhat.com> - 303-1
- Apps: Warn if appstream data package is missing
- Storage: Partitions can be resized
* Wed Sep 20 2023 Martin Pitt <mpitt@redhat.com> - 301-1
- WireGuard support
- Metrics: link to network interface details

View File

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

View File

@ -1,2 +1,2 @@
SHA512 (cockpit-301.tar.xz) = 1c56dab4c020dc8e8deb5c4d2469b1cdfca85f0c014260459a84bd45104af39311ba903d5b9927ede71a92bd264346009e644a15e51c543b3f47d9da05bbc68e
SHA512 (cockpit-machines-299.tar.xz) = 7e347e9debc16e42f3be6a9f5eea8125ef24985668358ecf0ece05b673c426023b0c7487cf5dce4b4c7fe847b77914420e94a6f7e7699ea4e8c503c033c8251c
SHA512 (cockpit-303.tar.xz) = 31f4c472d5a6ea54d74611cec777fbb54063fa870eb1882cc69b4659e737e714006ba19b796940e35cd9bc0288f570793fe1ddf67eb8704bf9f13c9cf544b700
SHA512 (cockpit-machines-300.tar.xz) = 1239293f3745a2ce494fd0609c7639cf717329d88cdf728bd1bad9a81d39a17d6c53d4044f5439beefe52750d395cf9169f209257501861270523806f7532357