diff --git a/buildah.spec b/buildah.spec index a39e9b2..49d4dd6 100644 --- a/buildah.spec +++ b/buildah.spec @@ -9,10 +9,14 @@ %global gomodulesmode GO111MODULE=on -%if 0%{defined fedora} +%if %{defined fedora} %define build_with_btrfs 1 %endif +%if %{defined rhel} +%define fips 1 +%endif + %global git0 https://github.com/containers/%{name} Name: buildah @@ -28,7 +32,7 @@ Epoch: 2 # If that's what you're reading, Version must be 0, and will be updated by Packit for # copr and koji builds. # If you're reading this on dist-git, the version is automatically filled in by Packit. -Version: 1.39.1 +Version: 1.39.2 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 Release: 1%{?dist} @@ -79,7 +83,9 @@ or Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} +%if %{defined fedora} Requires: bats +%endif Requires: bzip2 Requires: podman Requires: golang @@ -92,8 +98,7 @@ Requires: git-daemon %description tests %{summary} -This package contains system tests for %{name}. Only intended for distro -gating tests. End user/ customer usage not supported. +This package contains system tests for %{name} %prep %autosetup -Sgit -n %{name}-%{version} @@ -114,11 +119,15 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full" 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="libtrust_openssl seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" %if !%{defined build_with_btrfs} export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs" %endif +%if %{defined fips} +export BUILDTAGS+=" libtrust_openssl" +%endif + %gobuild -o bin/%{name} ./cmd/%{name} %gobuild -o bin/imgtype ./tests/imgtype %gobuild -o bin/copy ./tests/copy @@ -162,6 +171,10 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* %{_datadir}/%{name}/test %changelog +* Wed Mar 05 2025 Jindrich Novy - 2:1.39.2-1 +- update to https://github.com/containers/buildah/releases/tag/v1.39.2 +- Related: RHEL-80817 + * Thu Feb 27 2025 Jindrich Novy - 2:1.39.1-1 - update to https://github.com/containers/buildah/releases/tag/v1.39.1 - Resolves: RHEL-81133 diff --git a/sources b/sources index 11f7106..dad870d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.39.1.tar.gz) = aacbdf0962e55c1c6f107cf4184c951a72c68678e1940e81ecfdd7b40778a0af39cabaf842dbee8c9a4aa6b370f82b19d0f1abac41027304fd426360ddcf5a7b +SHA512 (v1.39.2.tar.gz) = 4a95093894cc82a68b4e98003fd89c97b0e16f282b21d38d4425cc06fc8fd27c92352cf59d5e9c97c54492b773d15f9a1708a0597aa82675f8a1d30193b06167