diff --git a/cockpit-appstream.spec b/cockpit-appstream.spec index 139ba26..04a9574 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 298 +%define machines_version 299 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly %if 0%{?centos} @@ -51,17 +51,14 @@ Summary: Web Console for Linux servers License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 300 +Version: 301 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 -%if 0%{?fedora} >= 38 || 0%{?rhel} >= 9 -%define cockpit_enable_python 1 -%endif - -%if !%{defined cockpit_enable_python} -%define cockpit_enable_python 0 +# Don't change the bridge in the RHEL 8; the old SSH breaks some features, see @todoPybridgeRHEL8 +%if 0%{?rhel} == 8 && !%{defined enable_old_bridge} +%define enable_old_bridge 1 %endif # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) @@ -106,7 +103,7 @@ BuildRequires: pam-devel BuildRequires: autoconf automake BuildRequires: make -BuildRequires: /usr/bin/python3 +BuildRequires: python3-devel %if 0%{?rhel} && 0%{?rhel} <= 8 # RHEL 8's gettext does not yet have metainfo.its BuildRequires: gettext >= 0.19.7 @@ -173,7 +170,7 @@ Suggests: cockpit-selinux Requires: subscription-manager-cockpit %endif -%if %{cockpit_enable_python} +%if 0%{?enable_old_bridge} == 0 BuildRequires: python3-devel BuildRequires: python3-pip %if 0%{?rhel} == 0 @@ -200,8 +197,8 @@ BuildRequires: python3-tox-current-env --docdir=%_defaultdocdir/%{name} \ %endif --with-pamdir='%{pamdir}' \ -%if %{cockpit_enable_python} - --enable-pybridge \ +%if 0%{?enable_old_bridge} + --enable-old-bridge \ %endif %if 0%{?build_basic} == 0 --disable-ssh \ @@ -212,7 +209,7 @@ BuildRequires: python3-tox-current-env %check make -j$(nproc) check -%if %{cockpit_enable_python} && 0%{?rhel} == 0 +%if 0%{?enable_old_bridge} == 0 && 0%{?rhel} == 0 %tox %endif @@ -382,7 +379,7 @@ system on behalf of the web based user interface. %doc %{_mandir}/man1/cockpit-bridge.1.gz %{_bindir}/cockpit-bridge %{_libexecdir}/cockpit-askpass -%if %{cockpit_enable_python} +%if 0%{?enable_old_bridge} == 0 %{python3_sitelib}/%{name}* %{_libexecdir}/cockpit-beiboot %endif @@ -434,17 +431,18 @@ Provides: cockpit-sosreport = %{version}-%{release} Recommends: (reportd if abrt) %endif -Provides: bundled(npm(@patternfly/patternfly)) = 5.0.2 -Provides: bundled(npm(@patternfly/react-core)) = 5.0.0 -Provides: bundled(npm(@patternfly/react-icons)) = 5.0.0 -Provides: bundled(npm(@patternfly/react-styles)) = 5.0.0 -Provides: bundled(npm(@patternfly/react-table)) = 5.0.0 -Provides: bundled(npm(@patternfly/react-tokens)) = 5.0.0 +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(argparse)) = 1.0.10 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(es-get-iterator)) = 1.1.3 @@ -819,6 +817,10 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Sep 20 2023 Martin Pitt - 301-1 +- WireGuard support +- Metrics: link to network interface details + * Wed Sep 06 2023 Martin Pitt - 300-1 - Celebrating the Nürnberg life release! - Storage: Support for growing block devices of a Stratis pool diff --git a/plans/all.fmf b/plans/all.fmf index 74c7a00..8b8cf0c 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: "298" + ref: "299" execute: how: tmt @@ -11,7 +11,7 @@ execute: summary: Run Cockpit tests for optional packages discover+: url: https://github.com/cockpit-project/cockpit - ref: "300" + ref: "301" test: /test/browser/optional /machines-basic: diff --git a/sources b/sources index d2054fb..bba0af0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cockpit-300.tar.xz) = 758e50c00ad203d26f2c442b13be43c1df86b32451d8f1e1bf38aab27801407d260d208028ede4f0d44c505dbba590d3429164ada829d580de6a09e67b4ab4fe -SHA512 (cockpit-machines-298.tar.xz) = e7286c2781f231d48565218aa35fa688ae469dc4495f6571fce1f925e63173b98b58c34be23bf36dcb315c2935fdd6a33a989ce6d8f5b75a806558f284dcf9eb +SHA512 (cockpit-301.tar.xz) = 1c56dab4c020dc8e8deb5c4d2469b1cdfca85f0c014260459a84bd45104af39311ba903d5b9927ede71a92bd264346009e644a15e51c543b3f47d9da05bbc68e +SHA512 (cockpit-machines-299.tar.xz) = 7e347e9debc16e42f3be6a9f5eea8125ef24985668358ecf0ece05b673c426023b0c7487cf5dce4b4c7fe847b77914420e94a6f7e7699ea4e8c503c033c8251c