From 29c9e5d4498eae2d8ac799d70e23da0f6d9ca2db Mon Sep 17 00:00:00 2001 From: Katerina Koukiou <kkoukiou@redhat.com> Date: Tue, 28 Mar 2023 10:38:42 +0200 Subject: [PATCH] Update to cockpit 289 and cockpit-machines 287 upstream releases Resolves: rhbz#1913548 --- .fmf/version | 1 + .gitignore | 2 + cockpit-appstream.spec | 93 +++++++++++++++++++++++++++++++++++++++--- plans/all.fmf | 32 +++++++++++++++ sources | 4 +- 5 files changed, 124 insertions(+), 8 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/all.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index ba2dd78..ea188db 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ SOURCES/cockpit-286.1.tar.xz SOURCES/cockpit-machines-284.1.tar.xz /cockpit-286.1.tar.xz /cockpit-machines-284.1.tar.xz +/cockpit-machines-287.tar.xz +/cockpit-289.tar.xz diff --git a/cockpit-appstream.spec b/cockpit-appstream.spec index 252c649..7a5020b 100644 --- a/cockpit-appstream.spec +++ b/cockpit-appstream.spec @@ -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 284.1 +%define machines_version 287 # 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: LGPLv2+ URL: https://cockpit-project.org/ -Version: 286.1 +Version: 289 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 @@ -208,9 +208,6 @@ echo '%{_libexecdir}/cockpit-ssh' >> base.list echo '%dir %{_datadir}/cockpit/pcp' > pcp.list find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list -echo '%dir %{_datadir}/cockpit/tuned' > system.list -find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list - echo '%dir %{_datadir}/cockpit/shell' >> system.list find %{buildroot}%{_datadir}/cockpit/shell -type f >> system.list @@ -256,7 +253,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 tuned users metrics; do +for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd users metrics; do rm -r %{buildroot}/%{_datadir}/cockpit/$pkg rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml done @@ -401,6 +398,85 @@ Provides: cockpit-sosreport = %{version}-%{release} Recommends: (reportd if abrt) %endif +Provides: bundled(npm(@patternfly/patternfly)) = 4.224.4 +Provides: bundled(npm(@patternfly/react-core)) = 4.276.8 +Provides: bundled(npm(@patternfly/react-icons)) = 4.93.6 +Provides: bundled(npm(@patternfly/react-styles)) = 4.92.6 +Provides: bundled(npm(@patternfly/react-table)) = 4.113.0 +Provides: bundled(npm(@patternfly/react-tokens)) = 4.94.6 +Provides: bundled(npm(argparse)) = 1.0.10 +Provides: bundled(npm(attr-accept)) = 1.1.3 +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(core-js)) = 2.6.12 +Provides: bundled(npm(deep-equal)) = 2.0.5 +Provides: bundled(npm(define-properties)) = 1.2.0 +Provides: bundled(npm(es-get-iterator)) = 1.1.3 +Provides: bundled(npm(file-selector)) = 0.1.19 +Provides: bundled(npm(focus-trap)) = 6.9.2 +Provides: bundled(npm(for-each)) = 0.3.3 +Provides: bundled(npm(function-bind)) = 1.1.1 +Provides: bundled(npm(functions-have-names)) = 1.2.3 +Provides: bundled(npm(get-intrinsic)) = 1.2.0 +Provides: bundled(npm(gopd)) = 1.0.1 +Provides: bundled(npm(has-bigints)) = 1.0.2 +Provides: bundled(npm(has-property-descriptors)) = 1.0.0 +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(internal-slot)) = 1.0.5 +Provides: bundled(npm(is-arguments)) = 1.1.1 +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 +Provides: bundled(npm(is-date-object)) = 1.0.5 +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-string)) = 1.0.7 +Provides: bundled(npm(is-symbol)) = 1.0.4 +Provides: bundled(npm(is-typed-array)) = 1.1.10 +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-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-is)) = 1.1.5 +Provides: bundled(npm(object-keys)) = 1.1.1 +Provides: bundled(npm(object.assign)) = 4.1.4 +Provides: bundled(npm(popper.js)) = 1.16.1 +Provides: bundled(npm(prop-types-extra)) = 1.1.1 +Provides: bundled(npm(prop-types)) = 15.8.1 +Provides: bundled(npm(react-dom)) = 18.2.0 +Provides: bundled(npm(react-dropzone)) = 9.0.0 +Provides: bundled(npm(react-is)) = 16.13.1 +Provides: bundled(npm(react)) = 18.2.0 +Provides: bundled(npm(regexp.prototype.flags)) = 1.4.3 +Provides: bundled(npm(remarkable)) = 2.0.1 +Provides: bundled(npm(scheduler)) = 0.23.0 +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)) = 5.3.3 +Provides: bundled(npm(throttle-debounce)) = 2.3.0 +Provides: bundled(npm(tippy.js)) = 5.1.2 +Provides: bundled(npm(tslib)) = 2.5.0 +Provides: bundled(npm(uuid)) = 7.0.3 +Provides: bundled(npm(warning)) = 4.0.3 +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.9 +Provides: bundled(npm(xterm-addon-canvas)) = 0.3.0 +Provides: bundled(npm(xterm)) = 5.1.0 + %description system This package contains the Cockpit shell and system configuration interfaces. @@ -711,6 +787,11 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Apr 06 2023 Katerina Koukiou <kkoukiou@redhat.com> - 289-1 +- Machines: Show an alert when virtualization is disabled in BIOS/EFI +- Storage: Mounting filesystems at boot time +- Machines: Create VM based on cloud image and start it later (rhbz#1913548) + * Thu Feb 23 2023 Martin Pitt <mpitt@redhat.com> - 286.1-1 - Translation updates (rhbz#2139719) diff --git a/plans/all.fmf b/plans/all.fmf new file mode 100644 index 0000000..b92ade7 --- /dev/null +++ b/plans/all.fmf @@ -0,0 +1,32 @@ +discover: + how: fmf + # for machines tests; keep in sync with cockpit-appstream.spec + url: https://github.com/cockpit-project/cockpit-machines + ref: "287" + +execute: + how: tmt + +/optional: + summary: Run Cockpit tests for optional packages + discover+: + url: https://github.com/cockpit-project/cockpit + ref: "289" + test: /test/browser/optional + +/machines-basic: + summary: Run basic Machines tests (creation and lifetime) + discover+: + test: /test/browser/basic + +/machines-network: + summary: Run network related Machines tests + discover+: + url: https://github.com/cockpit-project/cockpit-machines + test: /test/browser/network + +/machines-storage: + summary: Run storage related Machines tests + discover+: + url: https://github.com/cockpit-project/cockpit-machines + test: /test/browser/storage diff --git a/sources b/sources index 68ade99..6deaf58 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cockpit-286.1.tar.xz) = a84dfe8d7f860e226c349d4b872ad21ebc18f643143f78f3e2a388a2beae3ab06153e623dcce0d1b39c2dbc5d6c8baff049a281533129e963c3c1aa54505acd6 -SHA512 (cockpit-machines-284.1.tar.xz) = 8e9c472f3081753a96b43a6b7661a8d25a64859e489cc3d3182736d1afa77397fb5b9339794ea2d776fb9dcaec91f450e4b386a56cd61918eca447de978124cd +SHA512 (cockpit-machines-287.tar.xz) = 455659ea009986ee73be98c80510c3ef5f770fe907ad048d8be81bdd9f45861845ad80566f63ebdd91440265ed90185546a995029ea4a9ee0f514ae928db3650 +SHA512 (cockpit-289.tar.xz) = b8c6fd228c701ca2431b83c19cb11523632294fa80b8c3cfcddc8edee9a2b1a0ee97b2efc2be54e01314cc9604744a3e2dd0c6de3094425abc3a76e1fa02e27f