From 6cfbad8894071df242411805db30209c98988e1a Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Fri, 26 Jun 2026 14:28:51 +0200
Subject: [PATCH] update to 6.0.0 - Resolves: RHEL-185733

---
 podman.spec | 35 +++++++++++------------------------
 sources     |  2 +-
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/podman.spec b/podman.spec
index 07ec276..8663ecb 100644
--- a/podman.spec
+++ b/podman.spec
@@ -11,8 +11,8 @@
 %global sequoia 1
 
 %global import_path github.com/containers/podman
-#%%global branch v5.6-rhel
-%global commit0 93dbfd0d86ee57f8f91801f61ce57dd880a4725f
+#%%global branch v6.0-rhel
+%global commit0 a8ed4b6dd12992decf659cadfdfb3d0cb1937748
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 %global gomodulesmode GO111MODULE=on
@@ -32,16 +32,12 @@
 %define fips_enabled 1
 %endif
 
-%global container_base_path github.com/containers
-%global container_base_url https://%{container_base_path}
+%global container_base_path go.podman.io
 
 # For LDFLAGS
-%global ld_project %{container_base_path}/%{name}/v5
+%global ld_project %{container_base_path}/%{name}/v6
 %global ld_libpod %{ld_project}/libpod
 
-# %%{name}
-%global git0 %{container_base_url}/%{name}
-
 # podman-machine subpackage will be present only on these architectures
 %global machine_arches x86_64 aarch64
 
@@ -63,7 +59,7 @@ Epoch: 7
 # 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.8.3
+Version: 6.0.0
 # 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}
@@ -109,14 +105,8 @@ BuildRequires: systemd
 BuildRequires: systemd-devel
 Requires: catatonit
 Requires: conmon >= 2:2.1.7-2
-%if %{defined fedora} && 0%{?fedora} >= 40
-# TODO: Remove the f40 conditional after a few releases to keep conditionals to
-# a minimum
-# Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2269148
-Requires: containers-common-extra >= 5:0.58.0-1
-%else
-Requires: containers-common-extra
-%endif
+# Podman 6 requires the new config file layout.
+Requires: containers-common-extra >= 5:0.68.0
 %if %{defined sequoia}
 Requires: podman-sequoia
 %endif
@@ -166,7 +156,6 @@ Requires: nmap-ncat
 Requires: httpd-tools
 Requires: openssl
 Requires: socat
-Requires: slirp4netns
 Requires: buildah
 Requires: gnupg
 Requires: xfsprogs
@@ -358,12 +347,6 @@ ln -s ../qemu-kvm %{buildroot}%{_libexecdir}/%{name}/qemu-system-%{arch}
 %{_tmpfilesdir}/%{name}.conf
 %{_systemdgeneratordir}/%{name}-system-generator
 %{_systemdusergeneratordir}/%{name}-user-generator
-# iptables modules are only needed with iptables-legacy,
-# as of f41 netavark will default to nftables so do not load unessary modules
-# https://fedoraproject.org/wiki/Changes/NetavarkNftablesDefault
-%if %{defined fedora} && 0%{?fedora} < 41
-%{_modulesloaddir}/%{name}-iptables.conf
-%endif
 
 %files docker
 %{_bindir}/docker
@@ -400,6 +383,10 @@ ln -s ../qemu-kvm %{buildroot}%{_libexecdir}/%{name}/qemu-system-%{arch}
 %endif
 
 %changelog
+* Fri Jun 26 2026 Jindrich Novy <jnovy@redhat.com> - 7:6.0.0-1
+- update to https://github.com/containers/podman/releases/tag/v6.0.0
+- Resolves: RHEL-185733
+
 * Wed Jun 17 2026 Jindrich Novy <jnovy@redhat.com> - 7:5.8.3-1
 - update to https://github.com/containers/podman/releases/tag/v5.8.3
 - Resolves: RHEL-185733
diff --git a/sources b/sources
index 4680539..64e8667 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (podman-5.8.3-93dbfd0.tar.gz) = 32f706dfd870e1436a128e86fa76f243bc847096be5194a267364c617284f3b29c37b36efe10f9c93fdccec237fec839e67b890356150d9e26873eb24a78ac79
+SHA512 (podman-6.0.0-a8ed4b6.tar.gz) = aa7939d0dfa74f6a8fd5a28fc4ec8ec4c6fabdfac474a99b722111ddaa089c3828dabc3e1c8dd52b57198b0edd8b7cfb66e5b5833994f54bc145a19b90028178