From 12498c121ac11565ae29e60ce7874abc53826ee5 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Wed, 31 Jan 2024 18:40:32 +0100
Subject: [PATCH] Update to cockpit 310 and cockpit-machines 306 upstream
 releases

Resolves: jira#RHEL-17433
Resolves: jira#RHEL-22241
---
 cockpit-appstream.spec | 13 ++++++++++---
 plans/all.fmf          |  4 ++--
 sources                |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cockpit-appstream.spec b/cockpit-appstream.spec
index 81afa55..2f1858b 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 305
+%define machines_version 306
 
 # 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:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        309
+Version:        310
 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
@@ -516,7 +516,7 @@ Provides: bundled(npm(react)) = 18.2.0
 Provides: bundled(npm(regexp.prototype.flags)) = 1.5.1
 Provides: bundled(npm(remarkable)) = 2.0.1
 Provides: bundled(npm(scheduler)) = 0.23.0
-Provides: bundled(npm(set-function-length)) = 1.1.1
+Provides: bundled(npm(set-function-length)) = 1.2.0
 Provides: bundled(npm(set-function-name)) = 2.0.1
 Provides: bundled(npm(side-channel)) = 1.0.4
 Provides: bundled(npm(sprintf-js)) = 1.0.3
@@ -848,6 +848,13 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Jan 31 2024 Martin Pitt <mpitt@redhat.com> - 310-1
+- Storage: support for btrfs
+- Storage: improved support for swap
+- Machines: Action to Replace SPICE devices (RHEL-17433)
+- Machines: Create external snapshots when supported
+- Machines: Fix VM creation on s390x (RHEL-22241)
+
 * Thu Jan 18 2024 Martin Pitt <mpitt@redhat.com> - 309-1
 - Machines: Fix deletion of SSH keys (jira#RHEL-19598)
 
diff --git a/plans/all.fmf b/plans/all.fmf
index a9c8025..e3f1d4a 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: "305"
+    ref: "306"
 
 execute:
     how: tmt
@@ -11,7 +11,7 @@ execute:
     summary: Run Cockpit tests for optional packages
     discover+:
         url: https://github.com/cockpit-project/cockpit
-        ref: "308"
+        ref: "310"
         test: /test/browser/optional
 
 /machines-basic:
diff --git a/sources b/sources
index bf0b74e..430bfcc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cockpit-309.tar.xz) = 17e935515e7de32a09a6255273553394c4c47b551ae6c6e2545e143dc636d79fe5d58f903fdb8c92117eb45a60f64ef1d5bd086950a175f71cb11fa754b76c83
-SHA512 (cockpit-machines-305.tar.xz) = c757656495ee86671c6fa68d374eab2d5db55e54ab9c54e4dea601ce0161b799f5bfae32c2def3cf0ad10de87dc0095bd07f4a0b5b8e53221abaabfa01aa6b23
+SHA512 (cockpit-310.tar.xz) = 295dc948608af1d172fbb4721697c1b3d21e3d710fba04b8c23a2833b6dd556ace9edb630397b218a45ce4895d016c81e4fa670cbd09aa911470ab373d485b60
+SHA512 (cockpit-machines-306.tar.xz) = d2795425ebb857d07b3434fa7bb1762a2b456291080a91da453f3f9f81838cf15c39697aa13078e7411abe79fd02a5e94830ec60517e25bafa1f74e6783a54ee