From c72eee9475340246e79f5da37db3d4b1f57b4b78 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Tue, 16 May 2023 11:58:03 +0200
Subject: [PATCH] Update to cockpit 292 and cockpit-machines 290 upstream
 releases

Related: rhbz#2189559
---
 .gitignore             |  4 ++--
 cockpit-appstream.spec | 25 ++++++++++++++-----------
 plans/all.fmf          |  4 ++--
 sources                |  4 ++--
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58cba65..937c137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/cockpit-291.tar.xz
-/cockpit-machines-289.1.tar.xz
+/cockpit-292.tar.xz
+/cockpit-machines-290.tar.xz
diff --git a/cockpit-appstream.spec b/cockpit-appstream.spec
index bbcfa0f..74be730 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 289.1
+%define machines_version 290
 
 # 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:        291
+Version:        292
 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
@@ -173,8 +173,6 @@ Requires: subscription-manager-cockpit
 %if %{cockpit_enable_python}
 BuildRequires:  python3-devel
 BuildRequires:  python3-pip
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-wheel
 %if 0%{?rhel} == 0
 # All of these are only required for running pytest (which we only do on Fedora)
 BuildRequires:  procps-ng
@@ -434,12 +432,12 @@ Provides: cockpit-sosreport = %{version}-%{release}
 Recommends: (reportd if abrt)
 %endif
 
-Provides: bundled(npm(@patternfly/patternfly)) = 5.0.0-alpha.40
-Provides: bundled(npm(@patternfly/react-core)) = 5.0.0-alpha.72
-Provides: bundled(npm(@patternfly/react-icons)) = 5.0.0-alpha.10
-Provides: bundled(npm(@patternfly/react-styles)) = 5.0.0-alpha.7
-Provides: bundled(npm(@patternfly/react-table)) = 5.0.0-alpha.74
-Provides: bundled(npm(@patternfly/react-tokens)) = 5.0.0-alpha.7
+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/react-tokens)) = 5.0.0-alpha.9
 Provides: bundled(npm(argparse)) = 1.0.10
 Provides: bundled(npm(attr-accept)) = 2.2.2
 Provides: bundled(npm(autolinker)) = 3.16.2
@@ -498,7 +496,7 @@ 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.1
+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(uuid)) = 7.0.3
@@ -818,6 +816,11 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Tue May 16 2023 Martin Pitt <mpitt@redhat.com> - 292-1
+- Metrics: Add disk IO per service
+- Several right-to-left language fixes
+- Machines: Apply watchdog changes on next boot if hotplug fails
+
 * Tue May 09 2023 Martin Pitt <mpitt@redhat.com> - 291-1
 - Update to PatternFly 5 Alpha
 - Machines: Option to use RAW volume during VM creation
diff --git a/plans/all.fmf b/plans/all.fmf
index b74f83c..188cd09 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: "289.1"
+    ref: "290"
 
 execute:
     how: tmt
@@ -11,7 +11,7 @@ execute:
     summary: Run Cockpit tests for optional packages
     discover+:
         url: https://github.com/cockpit-project/cockpit
-        ref: "291"
+        ref: "292"
         test: /test/browser/optional
 
 /machines-basic:
diff --git a/sources b/sources
index fd0aaae..ab8b9ab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cockpit-291.tar.xz) = 9e3015f9c847b7d6fc5620d4953c4f09784e4df1dafa5c68437459850fcfb845b05815d3359a60fabd2dbdb196af4358f218cda7c55855e89a71e7d4b63bd131
-SHA512 (cockpit-machines-289.1.tar.xz) = 476271b9a3f72f16dd775a2dea8c65a5326a208bddf482bd821470828f97a769d99c760c305631836be7e006d35aa541c0ac5c3f2d3994797bffae77d9610d34
+SHA512 (cockpit-292.tar.xz) = fbf2dbb9c4c83208cd902d99bf66a7c45b944beb7cf26efa23e859a4d61c9c41ae5558236cba2a2da2ae753a0bd5e669fe776d454cabfc66d42958be785742bb
+SHA512 (cockpit-machines-290.tar.xz) = 609dcb532dbdd6adfbb4c779bf8a3b80503bbe3145768ba6f9bc5195fe2a7aaf0c68a77e040c44a5d79ead43ccc40b2335c67276f38c8fae17017a9f9a0005cf