import containers-common-1-39.module+el8.6.0+16891+aaa3bd4c
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
030a2bea42
commit
fd96a5a27e
|
|
@ -1,4 +1,4 @@
|
|||
92a2bbb50398d4326834e37c17d7ad0c2ed68e5f SOURCES/aardvark-dns-v1.0.3-a92337b.tar.gz
|
||||
c43b8b3548ebc251461f5667d01142e4491691a3 SOURCES/aardvark-dns-v1.0.3-vendor.tar.gz
|
||||
41313c08ae196941064c6b9c8a090be2381cce51 SOURCES/netavark-v1.0.3-ec7efb8.tar.gz
|
||||
26c57cd7077cd8088720082889e3f3c9d776e75c SOURCES/netavark-v1.0.3-vendor.tar.gz
|
||||
5a594964d481c7bbcf748a43599391619866eebb SOURCES/aardvark-dns-v1.0.1-rhel-vendor.tar.gz
|
||||
55243a6cb078d864c2de629f69005174770f9588 SOURCES/netavark-1.0.1-rhel-vendor.tar.gz
|
||||
a204a6b69eeb26a1ff1e934eed8c928a8e549f53 SOURCES/v1.0.1-rhel-03e1d60.tar.gz
|
||||
32687f7102fea472e000ffad5e605f753c8f461e SOURCES/v1.0.1-rhel-95a32bf.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SOURCES/aardvark-dns-v1.0.3-a92337b.tar.gz
|
||||
SOURCES/aardvark-dns-v1.0.3-vendor.tar.gz
|
||||
SOURCES/netavark-v1.0.3-ec7efb8.tar.gz
|
||||
SOURCES/netavark-v1.0.3-vendor.tar.gz
|
||||
SOURCES/aardvark-dns-v1.0.1-rhel-vendor.tar.gz
|
||||
SOURCES/netavark-1.0.1-rhel-vendor.tar.gz
|
||||
SOURCES/v1.0.1-rhel-03e1d60.tar.gz
|
||||
SOURCES/v1.0.1-rhel-95a32bf.tar.gz
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
Epoch: 2
|
||||
Name: containers-common
|
||||
Version: 1
|
||||
Release: 35%{?dist}
|
||||
Release: 39%{?dist}
|
||||
Summary: Common configuration and documentation for containers
|
||||
License: ASL 2.0
|
||||
BuildRequires: /usr/bin/go-md2man
|
||||
|
|
@ -65,27 +65,27 @@ Source100: update.sh
|
|||
Source101: update-vendored.sh
|
||||
Source102: pyxis.sh
|
||||
|
||||
%global aardvark_dns_version v1.0.3
|
||||
#%%global aardvark_dns_branch v1.0.1-rhel
|
||||
%global aardvark_dns_commit0 a92337b08fbd88c9eb10c1a5ebce2bf61aa59a7b
|
||||
%global aardvark_dns_version v1.0.1
|
||||
%global aardvark_dns_branch v1.0.1-rhel
|
||||
%global aardvark_dns_commit0 95a32bf243b4c96138e84bae2a9426fa0b472338
|
||||
%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
|
||||
%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_branch}-vendor.tar.gz
|
||||
|
||||
%global netavark_version v1.0.3
|
||||
#%%global netavark_branch v1.0.1-rhel
|
||||
%global netavark_commit0 ec7efb85ef90db4a14c07cb003b65491f7eb4edf
|
||||
%global netavark_version v1.0.1
|
||||
%global netavark_branch v1.0.1-rhel
|
||||
%global netavark_commit0 03e1d60312898d1ab83bfeb044ecda103ac90401
|
||||
%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
|
||||
%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-1.0.1-rhel-vendor.tar.gz
|
||||
|
||||
%description
|
||||
This package contains common configuration files and documentation for container
|
||||
|
|
@ -97,7 +97,7 @@ separately.
|
|||
|
||||
%package -n aardvark-dns
|
||||
Version: 1.0.1
|
||||
Release: 35%{?dist}
|
||||
Release: 39%{?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
|
||||
|
|
@ -117,7 +117,7 @@ Read more about configuration in `src/backend/mod.rs`.
|
|||
|
||||
%package -n netavark
|
||||
Version: 1.0.1
|
||||
Release: 35%{?dist}
|
||||
Release: 39%{?dist}
|
||||
URL: https://github.com/containers/netavark
|
||||
Summary: OCI network stack
|
||||
License: ASL 2.0 and BSD and MIT
|
||||
|
|
@ -154,7 +154,11 @@ Its features include:
|
|||
|
||||
%prep
|
||||
tar fx %{SOURCE200}
|
||||
%if 0%{?aardvark_dns_branch:1}
|
||||
pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
|
||||
%else
|
||||
pushd aardvark-dns-%{aardvark_dns_commit0}
|
||||
%endif
|
||||
tar fx %{SOURCE201}
|
||||
mkdir -p .cargo
|
||||
cat >.cargo/config << EOF
|
||||
|
|
@ -165,8 +169,14 @@ replace-with = "vendored-sources"
|
|||
directory = "vendor"
|
||||
EOF
|
||||
popd
|
||||
|
||||
tar fx %{SOURCE300}
|
||||
%if 0%{?netavark_branch:1}
|
||||
pushd containers-netavark-%{netavark_shortcommit0}
|
||||
%else
|
||||
pushd netavark-%{netavark_commit0}
|
||||
%endif
|
||||
|
||||
tar fx %{SOURCE301}
|
||||
mkdir -p .cargo
|
||||
cat >.cargo/config << EOF
|
||||
|
|
@ -183,12 +193,20 @@ popd
|
|||
export RUSTFLAGS="%{build_rustflags}"
|
||||
%endif
|
||||
|
||||
%if 0%{?aardvark_dns_branch:1}
|
||||
pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
|
||||
%else
|
||||
pushd aardvark-dns-%{aardvark_dns_commit0}
|
||||
%endif
|
||||
%__scm_setup_git -q
|
||||
%make_build build
|
||||
popd
|
||||
|
||||
%if 0%{?netavark_branch:1}
|
||||
pushd containers-netavark-%{netavark_shortcommit0}
|
||||
%else
|
||||
pushd netavark-%{netavark_commit0}
|
||||
%endif
|
||||
%__scm_setup_git -q
|
||||
%make_build build
|
||||
pushd docs
|
||||
|
|
@ -198,11 +216,19 @@ popd
|
|||
popd
|
||||
|
||||
%install
|
||||
%if 0%{?aardvark_dns_branch:1}
|
||||
pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
|
||||
%else
|
||||
pushd aardvark-dns-%{aardvark_dns_commit0}
|
||||
%endif
|
||||
%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
|
||||
popd
|
||||
|
||||
%if 0%{?netavark_branch:1}
|
||||
pushd containers-netavark-%{netavark_shortcommit0}
|
||||
%else
|
||||
pushd netavark-%{netavark_commit0}
|
||||
%endif
|
||||
%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
|
||||
popd
|
||||
|
||||
|
|
@ -295,17 +321,42 @@ EOF
|
|||
%{_datadir}/rhel/secrets/*
|
||||
|
||||
%files -n aardvark-dns
|
||||
%if 0%{?aardvark_dns_branch:1}
|
||||
%license containers-aardvark-dns-%{aardvark_dns_shortcommit0}/LICENSE
|
||||
%else
|
||||
%license aardvark-dns-%{aardvark_dns_commit0}/LICENSE
|
||||
%endif
|
||||
%dir %{_libexecdir}/podman
|
||||
%{_libexecdir}/podman/aardvark-dns
|
||||
|
||||
%files -n netavark
|
||||
%if 0%{?netavark_branch:1}
|
||||
%license containers-netavark-%{netavark_shortcommit0}/LICENSE
|
||||
%else
|
||||
%license netavark-%{netavark_commit0}/LICENSE
|
||||
%endif
|
||||
%dir %{_libexecdir}/podman
|
||||
%{_libexecdir}/podman/netavark
|
||||
%{_mandir}/man1/netavark.1*
|
||||
|
||||
%changelog
|
||||
* Wed Oct 12 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-39
|
||||
- use proper vendor tarball for aardvark-dns
|
||||
- Related: #2133391
|
||||
|
||||
* Wed Oct 12 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-38
|
||||
- revert to latest buildable version
|
||||
- Related: #2133391
|
||||
|
||||
* Tue Oct 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-37
|
||||
- also update aardvark-dns to v1.0.1-rhel branch
|
||||
- Related: #2133391
|
||||
|
||||
* Tue Oct 11 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
|
||||
- fix podman container got global IPv6 address unexpectedly even when macvlan
|
||||
network is created for pure IPv4 network
|
||||
- Resolves: #2133391
|
||||
|
||||
* Mon Jun 27 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
|
||||
- remove rhel-els and update shortnames
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue