From 4046ebdf5db5daf57a133120a5a35c1ad8e65c7d Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 29 Mar 2022 07:11:01 -0400
Subject: [PATCH] import podman-3.0.1-7.module+el8.6.0+12937+c86eb8d2

---
 .gitignore        |  2 +-
 .podman.metadata  |  2 +-
 SPECS/podman.spec | 27 ++++++++++++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7c5c130..51c2d31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/master-0a40c5a.tar.gz
 SOURCES/v0.1.5.tar.gz
 SOURCES/v1.1.1.tar.gz
+SOURCES/v3.0.1-rhel-4f91b37.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 434beb7..c8aabe1 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,3 +1,3 @@
-b782b31b9d5d642f30f070c7e9cd4a91410f517a SOURCES/master-0a40c5a.tar.gz
 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
 3d883ef197eeb1a602dfef79ee1027847cfd40a4 SOURCES/v1.1.1.tar.gz
+2937847d6c1485648d19468fe1530f2fee7589b5 SOURCES/v3.0.1-rhel-4f91b37.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 9383903..475177d 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -13,15 +13,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/podman
-%global branch master
-%global commit0 0a40c5a059455693de0cc9a3f4a2a16722fc61e9
+%global branch v3.0.1-rhel
+%global commit0 4f91b3737fbb2deae78cdb3120a7a4611ceef1da
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
 %global dnsnamever 1.1.1
 
 Name: podman
 Version: 3.0.1
-Release: 3%{?dist}
+Release: 7%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -305,6 +305,7 @@ exit 0
 
 %files docker
 %{_bindir}/docker
+%{_mandir}/man1/docker*.1*
 %{_usr}/lib/tmpfiles.d/%{name}-docker.conf
 
 %files remote
@@ -337,6 +338,26 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Oct 11 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-7
+- add missing docker man pages
+- Related: #2009106
+
+* Fri Oct 08 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-6
+- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
+  (https://github.com/containers/podman/commit/4f91b37)
+- Related: #2009106
+
+* Tue Aug 31 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-5
+- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
+  (https://github.com/containers/podman/commit/2bed76e)
+- fixes CVE-2021-3602
+- Related: #1977943
+
+* Mon Aug 30 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-4
+- update to the latest content of https://github.com/containers/podman/tree/v3.0.1-rhel
+  (https://github.com/containers/podman/commit/eebd611)
+- Related: #1934415
+
 * Wed Mar 03 2021 Jindrich Novy <jnovy@redhat.com> - 3.0.1-3
 - remove docker man page as it was removed upstream
 - Related: #1934415