From 4f6306fd2a1915cfcebf6a276592d4d232c3e6d6 Mon Sep 17 00:00:00 2001
From: Packit <hello@packit.dev>
Date: Mon, 27 Nov 2023 19:53:07 +0000
Subject: [PATCH] [packit] 4.8.0 upstream release

Upstream tag: v4.8.0
Upstream commit: c4dfcf14
---
 .gitignore    |  1 +
 .packit.yaml  |  3 +++
 README.packit |  2 +-
 podman.spec   | 22 ++++++++++++++++++++--
 sources       |  2 +-
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 345f3d8..6e0dfb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1839,3 +1839,4 @@
 /v4.7.1.tar.gz
 /v4.7.2.tar.gz
 /v4.8.0-rc1.tar.gz
+/v4.8.0.tar.gz
diff --git a/.packit.yaml b/.packit.yaml
index 3044626..31218d6 100644
--- a/.packit.yaml
+++ b/.packit.yaml
@@ -46,6 +46,9 @@ jobs:
   - job: tests
     identifier: cockpit-revdeps
     trigger: pull_request
+    notifications:
+      failure_comment:
+        message: "Cockpit tests failed for commit {commit_sha}. @martinpitt, @jelly, @mvollmer please check."
     targets:
       - fedora-latest-stable
       - fedora-development
diff --git a/README.packit b/README.packit
index 5998f60..d778d97 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.85.0.
+The file was generated using packit 0.86.2.post1.dev2+g209847d1.
diff --git a/podman.spec b/podman.spec
index 5cb58ca..0f5bf54 100644
--- a/podman.spec
+++ b/podman.spec
@@ -31,6 +31,10 @@
 %define build_with_btrfs 1
 %endif
 
+%if %{defined copr_username}
+%define copr_build 1
+%endif
+
 %global container_base_path github.com/containers
 %global container_base_url https://%{container_base_path}
 
@@ -48,7 +52,7 @@
 %global import_path_plugins %{container_base_path}/%{repo_plugins}
 
 Name: podman
-%if %{defined copr_username}
+%if %{defined copr_build}
 Epoch: 102
 %else
 Epoch: 5
@@ -59,7 +63,7 @@ Epoch: 5
 # 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: 4.8.0~rc1
+Version: 4.8.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: %autorelease
@@ -105,7 +109,11 @@ BuildRequires: python3
 Requires: catatonit
 Requires: conmon >= 2:2.1.7-2
 Requires: containers-common-extra
+%if %{defined rhel} && !%{defined eln}
+Recommends: gvisor-tap-vsock-gvforwarder
+%else
 Requires: gvisor-tap-vsock-gvforwarder
+%endif
 Recommends: gvisor-tap-vsock
 Provides: %{name}-quadlet
 Obsoletes: %{name}-quadlet <= 5:4.4.0-1
@@ -203,6 +211,14 @@ when `%{_bindir}/%{name}sh` is set as a login shell or set as os.Args[0].
 %autosetup -Sgit -n %{name}-%{version_no_tilde}
 sed -i 's;@@PODMAN@@\;$(BINDIR);@@PODMAN@@\;%{_bindir};' Makefile
 
+# These changes are only meant for copr builds
+%if %{defined copr_build}
+# podman --version should show short sha
+sed -i "s/^const RawVersion = .*/const RawVersion = \"##VERSION##-##SHORT_SHA##\"/" version/rawversion/version.go
+# use ParseTolerant to allow short sha in version
+sed -i "s/^var Version.*/var Version, err = semver.ParseTolerant(rawversion.RawVersion)/" version/version.go
+%endif
+
 # untar dnsname
 tar zxf %{SOURCE1}
 
@@ -219,6 +235,8 @@ CGO_CFLAGS=$(echo $CGO_CFLAGS | sed 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-an
 export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 %endif
 
+export GOPROXY=direct
+
 LDFLAGS="-X %{ld_libpod}/define.buildInfo=$(date +%s) \
          -X %{ld_libpod}/config._installPrefix=%{_prefix} \
          -X %{ld_libpod}/config._etcDir=%{_sysconfdir} \
diff --git a/sources b/sources
index 1328ecc..029e7a0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+SHA512 (v4.8.0.tar.gz) = 2178a9c8428a0cf2c402e0f299efe2ad9a797143e641a92438112694a4acbdfb69ba8c104c87f4763d001f17cedb709eef24d86460d095a61a64d29a168a2051
 SHA512 (dnsname-18822f9a4fb35d1349eb256f4cd2bfd372474d84.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
-SHA512 (v4.8.0-rc1.tar.gz) = 5b3cb3e78d311cf41c5b79ac0b93c34e77b7168230b6f307304be210a34606a937aa6039e2de14a5ae6271b94e7a19e12503335c3796f57c968df004d5f13607