From 9439aa25e088bd44b28692380808a00df73456f6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 15 Nov 2022 10:36:52 -0500
Subject: [PATCH] import podman-4.2.0-6.el9_1

---
 .gitignore        |  2 +-
 .podman.metadata  |  2 +-
 SPECS/podman.spec | 23 +++++++++++++++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index dbb29b8..8afeffe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 SOURCES/dnsname-18822f9.tar.gz
-SOURCES/podman-4.2.0-7fe5a41.tar.gz
 SOURCES/podman-machine-cni-0749884.tar.gz
 SOURCES/v0.1.7.tar.gz
 SOURCES/v0.2.0.tar.gz
+SOURCES/v4.2.0-rhel-d520a5c.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 8ba6b3e..0b139a4 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,5 +1,5 @@
 00c35447384f51ccc2360965b80868fc91293711 SOURCES/dnsname-18822f9.tar.gz
-3407e210353afdd5fcaffe91c6eeabb5d41c3c75 SOURCES/podman-4.2.0-7fe5a41.tar.gz
 70b08b173bdf0d1325fce035c186b43085865587 SOURCES/podman-machine-cni-0749884.tar.gz
 94419a237f932ff2a79c91f6e3005034d9c367a5 SOURCES/v0.1.7.tar.gz
 64a6ff113705a3726bc0d7d45e6c697b999c2683 SOURCES/v0.2.0.tar.gz
+76b5f5a75fe15d2725bab836c1a95a2b3f87717f SOURCES/v4.2.0-rhel-d520a5c.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 04546f9..fdecf1f 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -4,8 +4,8 @@
 GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
 
 %global import_path github.com/containers/podman
-#%%global branch v4.1.1-rhel
-%global commit0 7fe5a419cfd2880df2028ad3d7fd9378a88a04f4
+%global branch v4.2.0-rhel
+%global commit0 d520a5ccabfb21d1069c3567ffd94a6732787fa5
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.7
 #%%global dnsnamever 1.3.0
@@ -19,7 +19,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 Epoch: 2
 Name: podman
 Version: 4.2.0
-Release: 3%{?dist}
+Release: 6%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -68,7 +68,6 @@ Recommends: crun
 Requires: fuse-overlayfs
 Requires: %{name}-catatonit >= %{epoch}:%{version}-%{release}
 Requires: oci-runtime
-Conflicts: catatonit
 
 %description
 %{name} (Pod Manager) is a fully featured container engine that is a simple
@@ -111,6 +110,8 @@ variables, or in containers.conf.
 %package catatonit
 Summary: A signal-forwarding process manager for containers
 Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: catatonit < 3:0.1.7-8
+Provides: catatonit
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: file
@@ -418,6 +419,20 @@ fi
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
+* Wed Oct 26 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-6
+- update to the latest content of https://github.com/containers/podman/tree/v4.2.0-rhel
+  (https://github.com/containers/podman/commit/d520a5c)
+- Resolves: #2136845
+
+* Fri Oct 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-5
+- properly obsolete catatonit
+- Resolves: #2123319
+
+* Thu Oct 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-4
+- update to the latest content of https://github.com/containers/podman/tree/v4.2.0-rhel
+  (https://github.com/containers/podman/commit/4978898)
+- Resolves: #2124676
+
 * Mon Aug 22 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.2.0-3
 - fix dependency in test subpackage
 - Related: #2061316