diff --git a/buildah.spec b/buildah.spec index 5ed2d78..8f75479 100644 --- a/buildah.spec +++ b/buildah.spec @@ -30,7 +30,7 @@ Name: %{repo} Version: 1.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -105,7 +105,6 @@ popd mv vendor src export GOPATH=$(pwd)/_build:$(pwd) -#export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" export CGO_CFLAGS="-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" # FIXME: Investigate why this fails %ifnarch s390x @@ -117,6 +116,9 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" # These extra flags present in %%{optflags} have been skipped for now as they break the build #export CGO_CFLAGS+=" -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" +export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'` +export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}" + export BUILDTAGS='seccomp selinux' %if 0%{?centos} >= 8 export BUILDTAGS+=' exclude_graphdriver_btrfs' @@ -155,6 +157,9 @@ cp bin/copy %{buildroot}/%{_bindir}/%{name}-copy %{_datadir}/%{name}/test %changelog +* Thu Aug 05 2021 Lokesh Mandvekar - 1.22.0-2 +- Resolves: #1974086 - correct build date in buildah version + * Thu Aug 05 2021 Lokesh Mandvekar - 1.22.0-1 - bump to v1.22.0