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

import CS buildah-1.39.0-3.el9_6

Browse Source
This commit is contained in:
eabdullin 2025-03-31 09:44:28 +00:00
parent 5e340c8220
commit 7bff3c7e73
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SPECS/buildah.spec
View File

@ -35,7 +35,7 @@ Epoch: 2
Version: 1.39.0 Version: 1.39.0
# The `AND` needs to be uppercase in the License for SPDX compatibility # 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 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
Release: 2%{?dist} Release: 3%{?dist}
%if %{defined golang_arches_future} %if %{defined golang_arches_future}
ExclusiveArch: %{golang_arches_future} ExclusiveArch: %{golang_arches_future}
%else %else
@ -119,7 +119,7 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'` 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 LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" export BUILDTAGS="cni seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
%if !%{defined build_with_btrfs} %if !%{defined build_with_btrfs}
export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs" export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs"
%endif %endif
@ -171,6 +171,10 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%changelog %changelog
* Mon Feb 24 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.0-3
- Add CNI explicitly in BUILDTAGS
- Resolves: RHEL-80396
* Thu Feb 13 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.0-2 * Thu Feb 13 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.0-2
- sync spec with upstream - sync spec with upstream
- Related: RHEL-60277 - Related: RHEL-60277