From 18013fc9e14ee3c0f6554828f050b91128971ecc Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Thu, 15 Feb 2024 11:13:36 +0100
Subject: [PATCH] Update to upstream release 310.3

Resolves: jira#RHEL-16681
---
 cockpit.spec  | 37 ++++++-------------------------------
 plans/all.fmf |  2 +-
 sources       |  2 +-
 3 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/cockpit.spec b/cockpit.spec
index 71298ed..89ef2ac 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -49,16 +49,11 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        310
+Version:        310.3
 Release:        1%{?dist}
 Source0:        https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
 Source1:        cockpit.css.gz
 
-# 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})
 # and cockpit-appstream (building optional packages like cockpit-{pcp})
 # This split does not apply to EPEL/COPR nor packit c8s builds, only to our own
@@ -179,20 +174,6 @@ Suggests: cockpit-selinux
 Requires: subscription-manager-cockpit
 %endif
 
-%if 0%{?enable_old_bridge} == 0
-BuildRequires:  python3-devel
-BuildRequires:  python3-pip
-%if 0%{?rhel} == 0
-# All of these are only required for running pytest (which we only do on Fedora)
-BuildRequires:  procps-ng
-BuildRequires:  pyproject-rpm-macros
-BuildRequires:  python3-pytest-asyncio
-BuildRequires:  python3-pytest-cov
-BuildRequires:  python3-pytest-timeout
-BuildRequires:  python3-tox-current-env
-%endif
-%endif
-
 %prep
 %setup -q -n cockpit-%{version}
 
@@ -205,9 +186,6 @@ BuildRequires:  python3-tox-current-env
     --docdir=%_defaultdocdir/%{name} \
 %endif
     --with-pamdir='%{pamdir}' \
-%if 0%{?enable_old_bridge}
-    --enable-old-bridge \
-%endif
 %if 0%{?build_basic} == 0
     --disable-ssh \
 %endif
@@ -220,10 +198,6 @@ BuildRequires:  python3-tox-current-env
 %check
 make -j$(nproc) check
 
-%if 0%{?enable_old_bridge} == 0 && 0%{?rhel} == 0
-%tox
-%endif
-
 %install
 %make_install
 make install-tests DESTDIR=%{buildroot}
@@ -243,7 +217,7 @@ echo '%dir %{_datadir}/cockpit/base1' >> base.list
 find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
 echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
 echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
-%if 0%{?enable_old_bridge} && 0%{?build_basic}
+%if 0%{?build_basic}
 echo '%dir %{_datadir}/cockpit/ssh' >> base.list
 find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
 %endif
@@ -394,9 +368,6 @@ system on behalf of the web based user interface.
 %doc %{_mandir}/man1/cockpit-bridge.1.gz
 %{_bindir}/cockpit-bridge
 %{_libexecdir}/cockpit-askpass
-%if 0%{?enable_old_bridge} == 0
-%{python3_sitelib}/%{name}*
-%endif
 
 %package doc
 Summary: Cockpit deployment and developer guide
@@ -815,6 +786,10 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Feb 15 2024 Martin Pitt <mpitt@redhat.com> - 310.3-1
+- Translation updates (jira#RHEL-16681)
+  Lots of bug fixes
+
 * Wed Jan 31 2024 Packit <hello@packit.dev> - 310-1
 - Storage: support for btrfs
 - Storage: improved support for swap
diff --git a/plans/all.fmf b/plans/all.fmf
index b30c56b..225d03a 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -1,7 +1,7 @@
 discover:
     how: fmf
     url: https://github.com/cockpit-project/cockpit
-    ref: "310"
+    ref: "310.3"
 execute:
     how: tmt
 
diff --git a/sources b/sources
index bd1c1a9..e5cd965 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (cockpit-310.tar.xz) = 295dc948608af1d172fbb4721697c1b3d21e3d710fba04b8c23a2833b6dd556ace9edb630397b218a45ce4895d016c81e4fa670cbd09aa911470ab373d485b60
+SHA512 (cockpit-310.3.tar.xz) = 876f707eb9d9d49503f15b567d6579c144430b6825718e7492a1b3218ffa88e0d1058172d6b27729a7a8024210d78b03e23862069bc025df9904468929fcf57a
 SHA512 (cockpit.css.gz) = 1851e890e49141c17e498f1472c3bc307439cefaa0f1dccecbfc87b04087af03ca42199c86116c1fcf8890b58ca98f8aecfb01cc8b3c03a76e2685f7bd610568