From fb75841dffa4e8c49a45e67f82d661bc273b735c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 28 Jun 2023 15:50:34 +0200 Subject: [PATCH] Update to cockpit 295 and cockpit-machines 293 upstream releases Related: rhbz#2189559 --- .gitignore | 4 ++-- cockpit-appstream.spec | 42 +++++++++++++++++++++++++----------------- plans/all.fmf | 4 ++-- sources | 4 ++-- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 937c137..4a269fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/cockpit-292.tar.xz -/cockpit-machines-290.tar.xz +/cockpit-*.tar.xz +/cockpit-machines-*.tar.xz diff --git a/cockpit-appstream.spec b/cockpit-appstream.spec index f296023..b6990bc 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 290 +%define machines_version 293 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly %if 0%{?centos} @@ -48,15 +48,19 @@ Name: cockpit-appstream Summary: Web Console for Linux servers -License: LGPLv2+ +License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 292 +Version: 295 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 -# Experimental Python support +# Use Python bridge on non-stable versions +%if 0%{?fedora} >= 39 +%define cockpit_enable_python 1 +%endif + %if !%{defined cockpit_enable_python} %define cockpit_enable_python 0 %endif @@ -216,7 +220,7 @@ make -j$(nproc) check %install %make_install make install-tests DESTDIR=%{buildroot} -make -C %{_builddir}/cockpit-machines-%{machines_version}/cockpit-machines install DESTDIR=%{buildroot} +make -C %{_builddir}/cockpit-machines-%{machines_version}/cockpit-machines install DESTDIR=%{buildroot} PREFIX=/usr mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit rm -f %{buildroot}/%{_libdir}/cockpit/*.so @@ -298,8 +302,7 @@ rm -f %{buildroot}/%{_libdir}/security/pam_* rm -f %{buildroot}/usr/bin/cockpit-bridge rm -f %{buildroot}%{_libexecdir}/cockpit-ssh rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml -rm -rf %{buildroot}%{python3_sitelib}/cockpit/ -rm -rf %{buildroot}%{python3_sitelib}/cockpit-%{version}.dist-info/ +rm -rf %{buildroot}%{python3_sitelib}/cockpit* %endif # when not building optional packages, remove their files @@ -381,8 +384,7 @@ system on behalf of the web based user interface. %{_bindir}/cockpit-bridge %{_libexecdir}/cockpit-askpass %if %{cockpit_enable_python} -%{python3_sitelib}/%{name}/ -%{python3_sitelib}/%{name}-%{version}.dist-info/ +%{python3_sitelib}/%{name}* %endif %package doc @@ -432,11 +434,11 @@ Provides: cockpit-sosreport = %{version}-%{release} Recommends: (reportd if abrt) %endif -Provides: bundled(npm(@patternfly/patternfly)) = 5.0.0-alpha.43 -Provides: bundled(npm(@patternfly/react-core)) = 5.0.0-alpha.83 -Provides: bundled(npm(@patternfly/react-icons)) = 5.0.0-alpha.12 -Provides: bundled(npm(@patternfly/react-styles)) = 5.0.0-alpha.8 -Provides: bundled(npm(@patternfly/react-table)) = 5.0.0-alpha.85 +Provides: bundled(npm(@patternfly/patternfly)) = 5.0.0-alpha.53 +Provides: bundled(npm(@patternfly/react-core)) = 5.0.0-alpha.98 +Provides: bundled(npm(@patternfly/react-icons)) = 5.0.0-alpha.14 +Provides: bundled(npm(@patternfly/react-styles)) = 5.0.0-alpha.10 +Provides: bundled(npm(@patternfly/react-table)) = 5.0.0-alpha.100 Provides: bundled(npm(@patternfly/react-tokens)) = 5.0.0-alpha.9 Provides: bundled(npm(argparse)) = 1.0.10 Provides: bundled(npm(attr-accept)) = 2.2.2 @@ -447,14 +449,15 @@ 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.6.0 -Provides: bundled(npm(focus-trap)) = 7.4.0 +Provides: bundled(npm(focus-trap)) = 7.4.1 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(get-intrinsic)) = 1.2.1 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-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 @@ -498,7 +501,7 @@ Provides: bundled(npm(sprintf-js)) = 1.0.3 Provides: bundled(npm(stop-iteration-iterator)) = 1.0.0 Provides: bundled(npm(tabbable)) = 6.1.2 Provides: bundled(npm(throttle-debounce)) = 2.3.0 -Provides: bundled(npm(tslib)) = 2.5.0 +Provides: bundled(npm(tslib)) = 2.5.2 Provides: bundled(npm(uuid)) = 7.0.3 Provides: bundled(npm(which-boxed-primitive)) = 1.0.2 Provides: bundled(npm(which-collection)) = 1.0.1 @@ -817,6 +820,11 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Jun 28 2023 Martin Pitt - 295-1 +- Machines: Vsock device support +- Machines: Confirm shutdown actions +- Machines: Show virtual interface's TAP device + * Tue May 16 2023 Martin Pitt - 292-1 - Metrics: Add disk IO per service - Several right-to-left language fixes diff --git a/plans/all.fmf b/plans/all.fmf index 188cd09..4bb537e 100644 --- a/plans/all.fmf +++ b/plans/all.fmf @@ -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: "290" + ref: "293" execute: how: tmt @@ -11,7 +11,7 @@ execute: summary: Run Cockpit tests for optional packages discover+: url: https://github.com/cockpit-project/cockpit - ref: "292" + ref: "295" test: /test/browser/optional /machines-basic: diff --git a/sources b/sources index ab8b9ab..c9cfa14 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cockpit-292.tar.xz) = fbf2dbb9c4c83208cd902d99bf66a7c45b944beb7cf26efa23e859a4d61c9c41ae5558236cba2a2da2ae753a0bd5e669fe776d454cabfc66d42958be785742bb -SHA512 (cockpit-machines-290.tar.xz) = 609dcb532dbdd6adfbb4c779bf8a3b80503bbe3145768ba6f9bc5195fe2a7aaf0c68a77e040c44a5d79ead43ccc40b2335c67276f38c8fae17017a9f9a0005cf +SHA512 (cockpit-295.tar.xz) = 02928de8270c43ece910700e5bf419b06fb1f7f975ad8e7e36054e0b9dacfb6d608f466f7cda151b9fb265d671ff1459dbd4bf6302a1ea2edb6195b200079565 +SHA512 (cockpit-machines-293.tar.xz) = 88ca199d436bbd96898eeacfa05db5fb367858278d1ec1553e7b049894ae9383d2d621942eaf7b569834c477cfb5b4141ed7c731d0684b6ff5f88b8b2c941774