From d534ae097988bb0903381d094d7fbbff5e5c43f8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 24 2020 06:12:15 +0000
Subject: import podman-2.0.5-5.module+el8.3.0+8221+97165c3f


---

diff --git a/.gitignore b/.gitignore
index f65946d..bbcc536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
+SOURCES/podman-f5c9237.tar.gz
 SOURCES/v0.1.5.tar.gz
-SOURCES/v2.0.5-rhel.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 14794dd..01d8879 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,2 +1,2 @@
+55d55be1537d5b9b77aaae5c0526665fa0fc477f SOURCES/podman-f5c9237.tar.gz
 4502491739693bd1b1d108d9af545f69a3bd424b SOURCES/v0.1.5.tar.gz
-37b745b326f055b5b3793ef64c8f00d19874104e SOURCES/v2.0.5-rhel.tar.gz
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 0ab7eee..355a4da 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -14,6 +14,8 @@
 %if 0%{?rhel} > 7 && ! 0%{?fedora}
 %define gobuild(o:) \
 go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
+%else
+%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**};
 %endif
 
 %global provider github
@@ -24,15 +26,17 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
+%global commit0 f5c92373ec5e9d118cf6c098d1ae1b770e5055ae
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.5
 
 Name: podman
 Version: 2.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
-Source0: %{git0}/archive/v%{version}-rhel.tar.gz
+Source0: %{git0}/archive/%{commit0}/podman-%{shortcommit0}.tar.gz
 Source1: https://github.com/openSUSE/catatonit/archive/v%{cataver}.tar.gz
 # Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686
 ExcludeArch: i686
@@ -140,7 +144,7 @@ Requires: jq
 This package contains system tests for %{name}
 
 %prep
-%autosetup -Sgit -n %{name}-%{version}-rhel
+%autosetup -Sgit -n %{name}-%{commit0}
 tar fx %{SOURCE1}
 
 mv pkg/hooks/README.md pkg/hooks/README-hooks.md
@@ -292,6 +296,12 @@ exit 0
 %{_datadir}/%{name}/test
 
 %changelog
+* Wed Sep 23 2020 Jindrich Novy <jnovy@redhat.com> - 2.0.5-5
+- fix "[FJ8.3 Bug]: [REG] "--group-add" option of "podman create" doesn't work with "--user" option"
+- Resolves: #1877177
+- fix "`podman images --all` fails on images with digest"
+- Resolves: #1879622
+
 * Fri Sep 11 2020 Jindrich Novy <jnovy@redhat.com> - 2.0.5-4
 - consume content directly from the dedicated upstream branch
 - Related: #1877187