rpms/podman
6
0
Fork 0
Code Issues Pull Requests Releases Activity

podman-4.0.0-5.el9

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

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2022-02-24 17:53:05 -05:00
parent df54217ebb
commit 5525e505b2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
podman.spec
View File

@ -25,7 +25,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
Epoch: 2 Epoch: 2
Name: podman Name: podman
Version: 4.0.0 Version: 4.0.0
Release: 4%{?dist} Release: 5%{?dist}
Summary: Manage Pods, Containers and Container Images Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 and GPLv3+ License: ASL 2.0 and GPLv3+
URL: https://%{name}.io/ 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 rm -rf docs/source/markdown/containers-mounts.conf.5.md
%build %build
%set_build_flags
export GO111MODULE=off export GO111MODULE=off
export GOPATH=$(pwd)/_build:$(pwd) export GOPATH=$(pwd)/_build:$(pwd)
CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" 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 # build catatonit
LDFLAGS="%__global_ldflags" 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} pushd catatonit-%{cataver}
autoreconf -fi autoreconf -fi
%configure %configure
@ -411,6 +412,10 @@ exit 0
%{_libexecdir}/%{name}/gvproxy %{_libexecdir}/%{name}/gvproxy
%changelog %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 * Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:4.0.0-4
- add -D_FORTIFY_SOURCE=2 for podman-catatonit - add -D_FORTIFY_SOURCE=2 for podman-catatonit
- Related: #2054115 - Related: #2054115