From defe14073f8250aabbd360db3fbfd612e3928e53 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Wed, 9 Oct 2024 13:32:51 +0200
Subject: [PATCH] podman-5.2.2-1.el10

- stick to v5.2-rhel upstream branch for RHEL
- update to the latest content of https://github.com/containers/podman/tree/v5.2-rhel
  (https://github.com/containers/podman/commit/458f9b4)
- Related: RHEL-58990

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 podman.spec | 28 ++++++++++++++++++++++++----
 sources     |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/podman.spec b/podman.spec
index 004d440..5474c5a 100644
--- a/podman.spec
+++ b/podman.spec
@@ -7,6 +7,11 @@
 %global debug_package %{nil}
 %endif
 
+%global import_path github.com/containers/podman
+%global branch v5.2-rhel
+%global commit0 458f9b42760bf79aae4a96d0610b22f317ac7714
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
 # RHEL's default %%gobuild macro doesn't account for the BUILDTAGS variable, so we
 # set it separately here and do not depend on RHEL's go-[s]rpm-macros package
 # until that's fixed.
@@ -44,7 +49,7 @@ Name: podman
 %if %{defined copr_build}
 Epoch: 102
 %else
-Epoch: 5
+Epoch: 6
 %endif
 # DO NOT TOUCH the Version string!
 # The TRUE source of this specfile is:
@@ -52,7 +57,7 @@ Epoch: 5
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 5.2.4
+Version: 5.2.2
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: 1%{?dist}
@@ -64,7 +69,12 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64
 Summary: Manage Pods, Containers and Container Images
 URL: https://%{name}.io/
 # All SourceN files fetched from upstream
-Source0: %{git0}/archive/v%{version_no_tilde}.tar.gz
+%if 0%{?branch:1}
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+%else
+Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
+%endif
+
 Provides: %{name}-manpages = %{epoch}:%{version}-%{release}
 BuildRequires: %{_bindir}/envsubst
 %if %{defined build_with_btrfs}
@@ -192,7 +202,11 @@ This subpackage installs the dependencies for %{name} machine, for more see:
 https://docs.podman.io/en/latest/markdown/podman-machine.1.html
 
 %prep
-%autosetup -Sgit -n %{name}-%{version_no_tilde}
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
+%autosetup -Sgit -n %{name}-%{commit0}
+%endif
 sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile
 
 # cgroups-v1 is supported on rhel9
@@ -341,6 +355,12 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/virtiofsd
 
 %changelog
+* Wed Oct 09 2024 Jindrich Novy <jnovy@redhat.com> - 6:5.2.2-1
+- stick to v5.2-rhel upstream branch for RHEL
+- update to the latest content of https://github.com/containers/podman/tree/v5.2-rhel
+  (https://github.com/containers/podman/commit/458f9b4)
+- Related: RHEL-58990
+
 * Tue Oct 08 2024 Jindrich Novy <jnovy@redhat.com> - 5:5.2.4-1
 - update to https://github.com/containers/podman/releases/tag/v5.2.4
 - Related: RHEL-61719
diff --git a/sources b/sources
index 4598fa3..abbe5b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v5.2.4.tar.gz) = c6dc05cb377ba6ca3bf7a8d7875c97af9e82b972812702e011e41f7922a4546166061dd5fb809fbef9dd13ee233744de7b7fe16906d8d9631133fc4205a980c5
+SHA512 (v5.2-rhel-458f9b4.tar.gz) = 750be4f38db0445fea79cc2d20a3979c9c7c84fec79298defb53d2b899695d337bdd7e8feee8eb2e3f91dabda743e5b9c628ca1533eb125c1bc19d79fd8482c5