diff --git a/buildah.spec b/buildah.spec index 3dbefa9..c6db408 100644 --- a/buildah.spec +++ b/buildah.spec @@ -20,7 +20,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Name: buildah Version: 1.22.0 -Release: 0.13%{?dist} +Release: 0.14%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -94,6 +94,9 @@ export GOPATH=$(pwd)/_build:$(pwd) export BUILDTAGS='seccomp selinux btrfs_noversion exclude_graphdriver_btrfs' export GO111MODULE=off export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'` +export LDFLAGS="$LDFLAGS -X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}" + rm -f src/github.com/containers/storage/drivers/register/register_btrfs.go %gobuild -o bin/%{name} %{import_path}/cmd/%{name} %gobuild -o imgtype %{import_path}/tests/imgtype @@ -125,6 +128,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog +* Fri Jun 25 2021 Jindrich Novy - 1.22.0-0.14 +- "buildah version" produces correct output +- Related: #1970747 + * Fri Jun 25 2021 Jindrich Novy - 1.22.0-0.13 - update to the latest content of https://github.com/containers/buildah/tree/main (https://github.com/containers/buildah/commit/6bc611d)