diff --git a/containers-common.spec b/containers-common.spec index c2be25a..cdff741 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildRequires: /usr/bin/go-md2man @@ -83,7 +83,7 @@ separately. %package -n aardvark-dns Version: 1.0.1 -Release: 31%{?dist} +Release: 32%{?dist} URL: https://github.com/containers/aardvark-dns Summary: Authoritative DNS server for A/AAAA container records License: ASL 2.0 and BSD and MIT @@ -91,6 +91,7 @@ BuildRequires: cargo BuildRequires: git-core BuildRequires: make BuildRequires: rust-srpm-macros +BuildRequires: rust-toolset #ExclusiveArch: %%{rust_arches} ExclusiveArch: aarch64 ppc64le s390x x86_64 @@ -102,7 +103,7 @@ Read more about configuration in `src/backend/mod.rs`. %package -n netavark Version: 1.0.1 -Release: 31%{?dist} +Release: 32%{?dist} URL: https://github.com/containers/netavark Summary: OCI network stack License: ASL 2.0 and BSD and MIT @@ -113,6 +114,7 @@ BuildRequires: git-core BuildRequires: /usr/bin/go-md2man Recommends: aardvark-dns Provides: container-network-stack = 2 +BuildRequires: rust-toolset #ExclusiveArch: #%%{rust_arches} ExclusiveArch: aarch64 ppc64le s390x x86_64 @@ -163,14 +165,18 @@ EOF popd %build +%if 0%{?build_rustflags:1} +export RUSTFLAGS="%{build_rustflags}" +%endif + pushd aardvark-dns-%{aardvark_dns_commit0} %__scm_setup_git -q -%{__make} build +%make_build build popd pushd netavark-%{netavark_commit0} %__scm_setup_git -q -%{__make} build +%make_build build pushd docs go-md2man -in netavark.1.md -out netavark.1 popd @@ -284,6 +290,10 @@ EOF %{_mandir}/man1/netavark.1* %changelog +* Mon Feb 28 2022 Jindrich Novy - 2:1-32 +- build rust packages with RUSTFLAGS set to make ExecShield happy (Lokesh Mandvekar) +- Related: #2000051 + * Mon Feb 28 2022 Jindrich Novy - 2:1-31 - update to netavark and aardvark-dns 1.0.1 - Related: #2000051