rpms/containers-common
7
0
Fork 0
Code Issues Pull Requests Releases Activity

containers-common-1-33.el9

Browse Source 
- allow consuming aardvark-dns and netavark from upstream branches
- Related: #2061316

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2022-03-21 12:41:46 +01:00
parent 8a1e508180
commit 42f86f132d
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
containers-common.spec
View File

@ -12,7 +12,7 @@
Epoch: 2 Epoch: 2
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 32%{?dist} Release: 33%{?dist}
Summary: Common configuration and documentation for containers Summary: Common configuration and documentation for containers
License: ASL 2.0 License: ASL 2.0
BuildRequires: /usr/bin/go-md2man BuildRequires: /usr/bin/go-md2man
@ -62,15 +62,25 @@ Source101: update-vendored.sh
Source102: pyxis.sh Source102: pyxis.sh
%global aardvark_dns_version v1.0.1 %global aardvark_dns_version v1.0.1
#%%global aardvark_dns_branch v1.0.1-rhel
%global aardvark_dns_commit0 da6bc98b1b795d8ca4f4c77a7dbe383f5a62c6f5 %global aardvark_dns_commit0 da6bc98b1b795d8ca4f4c77a7dbe383f5a62c6f5
%global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7}) %global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
%if 0%{?aardvark_dns_branch:1}
Source200: https://github.com/containers/aardvark-dns/tarball/%{aardvark_dns_commit0}/%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz
%else
Source200: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_commit0}/aardvark-dns-%{aardvark_dns_version}-%{aardvark_dns_shortcommit0}.tar.gz Source200: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_commit0}/aardvark-dns-%{aardvark_dns_version}-%{aardvark_dns_shortcommit0}.tar.gz
%endif
Source201: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-vendor.tar.gz Source201: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_version}-vendor.tar.gz
%global netavark_version v1.0.1 %global netavark_version v1.0.1
#%%global netavark_branch v1.0.1-rhel
%global netavark_commit0 5810f9fec619ddf3c95737f9ba26c67f43a6c88c %global netavark_commit0 5810f9fec619ddf3c95737f9ba26c67f43a6c88c
%global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7}) %global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
%if 0%{?netavark_branch:1}
Source300: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz
%else
Source300: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz Source300: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz
%endif
Source301: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_version}-vendor.tar.gz Source301: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_version}-vendor.tar.gz
%description %description
@ -83,7 +93,7 @@ separately.
%package -n aardvark-dns %package -n aardvark-dns
Version: 1.0.1 Version: 1.0.1
Release: 32%{?dist} Release: 33%{?dist}
URL: https://github.com/containers/aardvark-dns URL: https://github.com/containers/aardvark-dns
Summary: Authoritative DNS server for A/AAAA container records Summary: Authoritative DNS server for A/AAAA container records
License: ASL 2.0 and BSD and MIT License: ASL 2.0 and BSD and MIT
@ -103,7 +113,7 @@ Read more about configuration in `src/backend/mod.rs`.
%package -n netavark %package -n netavark
Version: 1.0.1 Version: 1.0.1
Release: 32%{?dist} Release: 33%{?dist}
URL: https://github.com/containers/netavark URL: https://github.com/containers/netavark
Summary: OCI network stack Summary: OCI network stack
License: ASL 2.0 and BSD and MIT License: ASL 2.0 and BSD and MIT
@ -290,6 +300,10 @@ EOF
%{_mandir}/man1/netavark.1* %{_mandir}/man1/netavark.1*
%changelog %changelog
* Mon Mar 21 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-33
- allow consuming aardvark-dns and netavark from upstream branches
- Related: #2061316
* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-32 * Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-32
- build rust packages with RUSTFLAGS set to make ExecShield happy (Lokesh Mandvekar) - build rust packages with RUSTFLAGS set to make ExecShield happy (Lokesh Mandvekar)
- Related: #2000051 - Related: #2000051