Update to cockpit 296 and cockpit-machines 294 upstream releases

Resolves: rhbz#2215597
Resolves: rhbz#2215599

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 293
+%define machines_version 294
 
 # 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:        295
+Version:        296
 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
@@ -820,6 +820,10 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Jul 12 2023 Martin Pitt <mpitt@redhat.com> - 296-1
+ - Machines: Fix "Edit" button CSS for transient VMs (rhbz#2215597)
+ - Machines: Fix format detection for CD/DVD images (rhbz#2215599)
+
 * Wed Jun 28 2023 Martin Pitt <mpitt@redhat.com> - 295-1
 - Machines: Vsock device support
 - Machines: Confirm shutdown actions

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: "293"
+    ref: "294"
 
 execute:
     how: tmt
@@ -11,7 +11,7 @@ execute:
     summary: Run Cockpit tests for optional packages
     discover+:
         url: https://github.com/cockpit-project/cockpit
-        ref: "295"
+        ref: "296"
         test: /test/browser/optional
 
 /machines-basic:

sources

@@ -1,2 +1,2 @@
-SHA512 (cockpit-295.tar.xz) = 02928de8270c43ece910700e5bf419b06fb1f7f975ad8e7e36054e0b9dacfb6d608f466f7cda151b9fb265d671ff1459dbd4bf6302a1ea2edb6195b200079565
-SHA512 (cockpit-machines-293.tar.xz) = 88ca199d436bbd96898eeacfa05db5fb367858278d1ec1553e7b049894ae9383d2d621942eaf7b569834c477cfb5b4141ed7c731d0684b6ff5f88b8b2c941774
+SHA512 (cockpit-296.tar.xz) = 009952589ba9ac3f3614d1b1536bb9f7411692b814ec8fa89e236d89f44083e71c3434b740e624f0537bf9e517d9cfd43a3c376849f47ed4894bcfe7a6fe1f90
+SHA512 (cockpit-machines-294.tar.xz) = 3536dab89560eecf29e22ba7cb754a8b8ea1ded5a4af6e3fdf2394c460f4799e5cb213322b401d07248fa84f489d14658ff1b9449f6e7ee1b63a11be2b2e8294