From 5525e505b21df5fd758817dd5eecfd19731242ee Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Thu, 24 Feb 2022 17:53:05 -0500
Subject: [PATCH] podman-4.0.0-5.el9

- revert previous change and run `set_build_flags` before the build process
- Related: #2054115

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 podman.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/podman.spec b/podman.spec
index 1190f61..1ff850b 100644
--- a/podman.spec
+++ b/podman.spec
@@ -25,7 +25,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 Epoch: 2
 Name: podman
 Version: 4.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -191,6 +191,7 @@ mv pkg/hooks/README.md pkg/hooks/README-hooks.md
 rm -rf docs/source/markdown/containers-mounts.conf.5.md
 
 %build
+%set_build_flags
 export GO111MODULE=off
 export GOPATH=$(pwd)/_build:$(pwd)
 CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -229,7 +230,7 @@ export BUILDTAGS="remote $BUILDTAGS"
 
 # build catatonit
 LDFLAGS="%__global_ldflags"
-CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wp,-D_FORTIFY_SOURCE=2"
+CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 pushd catatonit-%{cataver}
 autoreconf -fi
 %configure
@@ -411,6 +412,10 @@ exit 0
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
+* Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.0.0-5
+- revert previous change and run `set_build_flags` before the build process
+- Related: #2054115
+
 * Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.0.0-4
 - add -D_FORTIFY_SOURCE=2 for podman-catatonit
 - Related: #2054115