From 21dc62875d6ecf19eb07a2bc0907e0ad2b4efda5 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Wed, 26 Jul 2023 13:11:59 +0200
Subject: [PATCH] Update to upstream release 297

HACK: Hardcode selinux-policy version, as the c8s compose or mirror is
badly lagging behind, and the version it gets built against isn't
available.

Related: rhbz#2189558
---
 README.packit |  2 +-
 cockpit.spec  | 33 ++++++++++++++++++---------------
 plans/all.fmf |  2 +-
 sources       |  2 +-
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/README.packit b/README.packit
index 7f24510..9d6cbbc 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.78.0.
+The file was generated using packit 0.78.1.
diff --git a/cockpit.spec b/cockpit.spec
index fd44511..f6000e4 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -49,13 +49,12 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        296
+Version:        297
 Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 Source1:        cockpit.css.gz
 
-# Use Python bridge on non-stable versions
-%if 0%{?fedora} >= 39
+%if 0%{?fedora} >= 38 || 0%{?rhel} >= 9
 %define cockpit_enable_python 1
 %endif
 
@@ -430,12 +429,12 @@ Provides: cockpit-sosreport = %{version}-%{release}
 Recommends: (reportd if abrt)
 %endif
 
-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(@patternfly/patternfly)) = 5.0.0-prerelease.8
+Provides: bundled(npm(@patternfly/react-core)) = 5.0.0-alpha.132
+Provides: bundled(npm(@patternfly/react-icons)) = 5.0.0-alpha.21
+Provides: bundled(npm(@patternfly/react-styles)) = 5.0.0-alpha.19
+Provides: bundled(npm(@patternfly/react-table)) = 5.0.0-alpha.136
+Provides: bundled(npm(@patternfly/react-tokens)) = 5.0.0-alpha.16
 Provides: bundled(npm(argparse)) = 1.0.10
 Provides: bundled(npm(attr-accept)) = 2.2.2
 Provides: bundled(npm(autolinker)) = 3.16.2
@@ -445,7 +444,7 @@ 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.1
+Provides: bundled(npm(focus-trap)) = 7.4.3
 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
@@ -469,7 +468,6 @@ 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
@@ -495,13 +493,13 @@ 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)) = 6.1.2
+Provides: bundled(npm(tabbable)) = 6.2.0
 Provides: bundled(npm(throttle-debounce)) = 2.3.0
-Provides: bundled(npm(tslib)) = 2.5.2
+Provides: bundled(npm(tslib)) = 2.6.1
 Provides: bundled(npm(uuid)) = 7.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(which-typed-array)) = 1.1.11
 Provides: bundled(npm(xterm-addon-canvas)) = 0.3.0
 Provides: bundled(npm(xterm)) = 5.1.0
 
@@ -516,7 +514,8 @@ Summary: Cockpit Web Service
 Requires: glib-networking
 Requires: openssl
 Requires: glib2 >= 2.50.0
-Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype})
+# HACK: should be %{_selinux_policy_version}, but composes are lagging behind
+Requires: (selinux-policy >= 3.14.3 if selinux-policy-%{selinuxtype})
 Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
 Conflicts: firewalld < 0.6.0-1
 Recommends: sscg >= 2.3
@@ -787,6 +786,10 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Jul 26 2023 Packit <hello@packit.dev> - 297-1
+- users: allow administrators to change the user shell
+- Enable Python bridge on Fedora 38 and CentOS/RHEL 9
+
 * Wed Jul 12 2023 Packit <hello@packit.dev> - 296-1
 - Performance and stability improvements
 
diff --git a/plans/all.fmf b/plans/all.fmf
index 2929d34..6d677d6 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -1,7 +1,7 @@
 discover:
     how: fmf
     url: https://github.com/cockpit-project/cockpit
-    ref: "296"
+    ref: "297"
 execute:
     how: tmt
 
diff --git a/sources b/sources
index 9f6a844..53e34a1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cockpit-296.tar.xz) = 009952589ba9ac3f3614d1b1536bb9f7411692b814ec8fa89e236d89f44083e71c3434b740e624f0537bf9e517d9cfd43a3c376849f47ed4894bcfe7a6fe1f90
+SHA512 (cockpit-297.tar.xz) = 4b8f97328f939a28510290c95405acc8e1e2b64ecb194ee9a7fb5a0c79f6e40f7930bfd7b711d36e43a8baf40b57009cbec3e32574c0e7552583332304006c67
 SHA512 (cockpit.css.gz) = 1851e890e49141c17e498f1472c3bc307439cefaa0f1dccecbfc87b04087af03ca42199c86116c1fcf8890b58ca98f8aecfb01cc8b3c03a76e2685f7bd610568