From 0e43636b00577485d122dfa542cc4b3c034c2888 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Mon, 25 Sep 2023 07:27:30 +0200
Subject: [PATCH] Update to upstream release 301

Resolves: jira#RHEL-2215
---
 cockpit.spec  | 40 +++++++++++++++++++++-------------------
 plans/all.fmf |  4 +++-
 sources       |  2 +-
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/cockpit.spec b/cockpit.spec
index db94b0b..0f3d405 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -49,17 +49,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:        cockpit.css.gz
 
-%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})
@@ -103,7 +100,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
@@ -170,7 +167,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
@@ -196,8 +193,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 \
@@ -208,7 +205,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
 
@@ -378,7 +375,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
@@ -430,17 +427,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
@@ -786,6 +784,10 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Sep 20 2023 Packit <hello@packit.dev> - 301-1
+- WireGuard support
+- Metrics: link to network interface details
+
 * Wed Sep 06 2023 Packit <hello@packit.dev> - 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 a8dc315..3eac90f 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -1,7 +1,9 @@
 discover:
     how: fmf
     url: https://github.com/cockpit-project/cockpit
-    ref: "300"
+    # ref: "301"
+    # 301 plus Fix installation of cockpit-tests
+    ref: "bd60838e581fe9193e0b794adea0023e98e85186"
 execute:
     how: tmt
 
diff --git a/sources b/sources
index fa2169d..3cb027a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cockpit-300.tar.xz) = 758e50c00ad203d26f2c442b13be43c1df86b32451d8f1e1bf38aab27801407d260d208028ede4f0d44c505dbba590d3429164ada829d580de6a09e67b4ab4fe
+SHA512 (cockpit-301.tar.xz) = 1c56dab4c020dc8e8deb5c4d2469b1cdfca85f0c014260459a84bd45104af39311ba903d5b9927ede71a92bd264346009e644a15e51c543b3f47d9da05bbc68e
 SHA512 (cockpit.css.gz) = 1851e890e49141c17e498f1472c3bc307439cefaa0f1dccecbfc87b04087af03ca42199c86116c1fcf8890b58ca98f8aecfb01cc8b3c03a76e2685f7bd610568