diff --git a/buildah.spec b/buildah.spec index 55d22df..aa31f85 100644 --- a/buildah.spec +++ b/buildah.spec @@ -15,7 +15,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 2 Name: buildah Version: 1.33.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A command line tool used for creating OCI Images License: ASL 2.0 URL: https://%{name}.io @@ -36,6 +36,7 @@ BuildRequires: /usr/bin/go-md2man BuildRequires: gpgme-devel BuildRequires: device-mapper-devel BuildRequires: libassuan-devel +BuildRequires: shadow-utils-subid-devel BuildRequires: make Recommends: crun Requires: oci-runtime @@ -92,7 +93,7 @@ popd mv vendor src export GOPATH=$(pwd)/_build:$(pwd) -export BUILDTAGS='seccomp selinux btrfs_noversion exclude_graphdriver_btrfs' +export BUILDTAGS="seccomp exclude_graphdriver_devicemapper selinux btrfs_noversion exclude_graphdriver_btrfs $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" 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,.* ,,'` @@ -134,6 +135,10 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install %{_datadir}/%{name}/test %changelog +* Mon Feb 26 2024 Jindrich Novy - 2:1.33.6-2 +- update tags for systemd libsubid +- Resolves: RHEL-26594 + * Fri Feb 16 2024 Jindrich Novy - 2:1.33.6-1 - update to the latest content of https://github.com/containers/buildah/tree/release-1.33 (https://github.com/containers/buildah/commit/f843563)