From b8bf741b2f3e51735f124702d14666815189c617 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Fri, 4 Aug 2023 15:42:40 +0200
Subject: [PATCH] podman-4.6.0-3.el8

- build podman 4.6.0 off main branch for early testing of zstd compression
- Related: #2176055

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

diff --git a/podman.spec b/podman.spec
index 81b393a..1ec685a 100644
--- a/podman.spec
+++ b/podman.spec
@@ -7,8 +7,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.4.1-rhel
-%global commit0 38e6fab9664c6e59b66e73523b307a56130316ae
+%global branch main
+%global commit0 144098587706ac3fd4e257ea03c75aaf4ee29064
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.7
 #%%global dnsnamever 1.3.0
@@ -21,7 +21,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 Epoch: 3
 Name: podman
 Version: 4.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 URL: https://%{name}.io/
@@ -44,7 +44,6 @@ BuildRequires: glib2-devel
 BuildRequires: glibc-devel
 BuildRequires: glibc-static
 BuildRequires: git-core
-BuildRequires: /usr/bin/go-md2man
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: libgpg-error-devel
@@ -208,7 +207,7 @@ fi
 set -e
 popd
 
-export GO111MODULE=off
+export GO111MODULE=on
 export GOPATH=$(pwd)/_build:$(pwd)
 CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 # These extra flags present in $CFLAGS have been skipped for now as they break the build
@@ -421,6 +420,10 @@ fi
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
+* Fri Aug 04 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.6.0-3
+- build podman 4.6.0 off main branch for early testing of zstd compression
+- Related: #2176055
+
 * Fri Aug 04 2023 Jindrich Novy <jnovy@redhat.com> - 3:4.6.0-2
 - update license token to be SPDX compatible
 - Related: #2176055
diff --git a/sources b/sources
index c2c88d2..a8fc317 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (podman-4.6.0-38e6fab.tar.gz) = 0be10693fd5fd576bf57834f30d86a7b667db36c1785de3c5938a33b7ea2ca18fb3ff8e53982def638743ec875e3a55aeabde056d0e841af8a5661a7705790d6
 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67
 SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
 SHA512 (gvisor-tap-vsock-407efb5dcdb0f4445935f7360535800b60447544.tar.gz) = 8b9e687c8be7063641839b5764787ae82561635ae6410585a3c70552bed741e6a63154f55d0209a6408861d5ee76619a765e70b2deda37d38802f6e5b57f2a4c
+SHA512 (main-1440985.tar.gz) = a46ae5fd06ea9a43f347672d129d49d6d99bc99e443feca35cbbcb194d0e8d5df20f10351a6c4f0adb8b2f7d3ec920a8f98559481743e2ede4ee522ccbaaee8f