aardvark-dns-1.10.1-2.el8

- build off the RHEL maintenance branch
- Resolves: RHEL-59129

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

.gitignore

@@ -1,12 +1 @@
-/aardvark-dns-v1.5.0-vendor.tar.gz
+/*.tar.*
-/v1.5.0.tar.gz
-/v1.6.0.tar.gz
-/aardvark-dns-v1.6.0-vendor.tar.gz
-/v1.7.0.tar.gz
-/aardvark-dns-v1.7.0-vendor.tar.gz
-/v1.8.0.tar.gz
-/aardvark-dns-v1.8.0-vendor.tar.gz
-/aardvark-dns-v1.9.0-vendor.tar.gz
-/v1.9.0.tar.gz
-/v1.10.0.tar.gz
-/aardvark-dns-v1.10.0-vendor.tar.gz

aardvark-dns.spec

@@ -1,20 +1,29 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
+%global aardvark_dns_branch v1.10.1-rhel
+%global aardvark_dns_commit0 3d0fec1eb11bfe722ed645c5717425195d4d481f
+%global aardvark_dns_shortcommit0 %(c=%{aardvark_dns_commit0}; echo ${c:0:7})
+
 Epoch: 2
 Name: aardvark-dns
-Version: 1.10.0
+Version: 1.10.1
 License: ASL 2.0 and BSD and MIT
-Release: 1%{?dist}
+Release: 2%{?dist}
 ExclusiveArch: %{rust_arches}
 Summary: Authoritative DNS server for A/AAAA container records
 URL: https://github.com/containers/aardvark-dns
-Source0: %{url}/archive/v%{version}.tar.gz
+%if 0%{?aardvark_dns_branch:1}
-Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
+Source0: https://github.com/containers/aardvark-dns/tarball/%{aardvark_dns_commit0}/%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz
+%else
+Source0: https://github.com/containers/aardvark-dns/archive/%{aardvark_dns_commit0}/aardvark-dns-%{aardvark_dns_branch}-%{aardvark_dns_shortcommit0}.tar.gz
+%endif
+Source1: https://github.com/containers/aardvark-dns/releases/download/%{aardvark_dns_version}/aardvark-dns-%{aardvark_dns_branch}-vendor.tar.gz
 BuildRequires: cargo
 BuildRequires: git-core
 BuildRequires: make
 BuildRequires: rust-srpm-macros
+Conflicts: netavark < %{epoch}:%{version}
 
 %description
 %{summary}
@@ -23,7 +32,12 @@ Forwards other request to configured resolvers.
 Read more about configuration in `src/backend/mod.rs`.
 
 %prep
-%autosetup -Sgit
+tar fx %{SOURCE0}
+%if 0%{?aardvark_dns_branch:1}
+pushd containers-aardvark-dns-%{aardvark_dns_shortcommit0}
+%else
+pushd aardvark-dns-%{aardvark_dns_commit0}
+%endif
 tar fx %{SOURCE1}
 mkdir -p .cargo
 
@@ -39,17 +53,38 @@ offline = true
 EOF
 
 %build
-%{__make} build
+%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
 
 %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
 
 %files
-%license LICENSE
+%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/%{name}
 
 %changelog
+* Wed Sep 25 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.1-2
+- build off the RHEL maintenance branch
+- Resolves: RHEL-59129
+
 * Thu Jan 25 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.0-1
 - update to https://github.com/containers/aardvark-dns/releases/tag/v1.10.0
 - Related: Jira:RHEL-2110
@@ -89,7 +124,6 @@ EOF
 * Wed Sep 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.2.0-1
 - update to https://github.com/containers/aardvark-dns/releases/tag/v1.2.0
 - Related: #2116481
-
 * Wed Aug 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-4
 - remove windows binaries and regenerate vendor tarball
 - Related: #2061390

sources

@@ -1,2 +1,2 @@
-SHA512 (v1.10.0.tar.gz) = 9ff315dc576f94bfc0affb6658bb47d9b7d448cf11294df607f7e8701662f148fb655f1eae6eb118f16b9e0779d27ab86d651883b1fd3bdc0e29c587bf47729b
+SHA512 (aardvark-dns-v1.10.1-rhel-vendor.tar.gz) = cdf3688d966fc1c658741aa6c9a86bffc83c47ae49b4b4d9171a7a07780ccee19b8155f21497c5d8d60f7bfe328821922473a9e93825a9512113d1d9766d8636
-SHA512 (aardvark-dns-v1.10.0-vendor.tar.gz) = 68d0106b71f42ba789810020d62911d880debf90a35a086aabfd614403985025dc0c5934087a98943b53f6dfd8ede4add99465cec1ae9a098ff1de1082e1ef9c
+SHA512 (v1.10.1-rhel-3d0fec1.tar.gz) = c5df2c4df9b1933814e95b5ff314dea45845c138eb9001db8f824c0d7936a2cd1af6121ec5a97d568fe4aa428c54c86a8c611beac131b64ac209346cbf71db35