3 changed files with 77 additions and 199 deletions
--- a/.aardvark-dns.metadata
+++ b/.aardvark-dns.metadata
@ -1,2 +1,2 @@
-1d4255f93321a59fcdcd22b6f5d38897d2deea66 SOURCES/aardvark-dns-v1.13.1-vendor.tar.gz
-bf210f9dded47cb7a4c1dee9ee59d41b415f87dd SOURCES/v1.13.1.tar.gz
+8776959420bbf7d04e1da4c2caf76f460f21ff47 SOURCES/aardvark-dns-v1.12.2-vendor.tar.gz
+a7354830fcca9d6cf242b5f118dc49eec7c6cfd0 SOURCES/v1.12.2.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/aardvark-dns-v1.13.1-vendor.tar.gz
-SOURCES/v1.13.1.tar.gz
+SOURCES/aardvark-dns-v1.12.2-vendor.tar.gz
+SOURCES/v1.12.2.tar.gz
--- a/SPECS/aardvark-dns.spec
+++ b/SPECS/aardvark-dns.spec
@ -1,56 +1,21 @@
-## START: Set by rpmautospec
-## (rpmautospec version 0.6.5)
-## RPMAUTOSPEC: autochangelog
-## END: Set by rpmautospec
-
-# trust-dns-{client,server} not available
-# using vendored deps
-
-%global with_debug 1
-
-%if 0%{?with_debug}
-%global _find_debuginfo_dwz_opts %{nil}
-%global _dwz_low_mem_die_limit 0
-%else
+# debuginfo doesn't work yet
 %global debug_package %{nil}
-%endif

-Name: aardvark-dns
-%if %{defined copr_username}
-Epoch: 102
-%else
 Epoch: 2
-%endif
-# DO NOT TOUCH the Version string!
-# The TRUE source of this specfile is:
-# https://github.com/containers/podman/blob/main/rpm/podman.spec
-# If that's what you're reading, Version must be 0, and will be updated by Packit for
-# copr and koji builds.
-# If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.13.1
-# The `AND` needs to be uppercase in the License for SPDX compatibility
-License: Apache-2.0 AND MIT AND Zlib
+Name: aardvark-dns
+Version: 1.12.2
+License: ASL 2.0 and BSD and MIT
 Release: 1%{?dist}
-%if %{defined golang_arches_future}
-ExclusiveArch: %{golang_arches_future}
-%else
-ExclusiveArch: aarch64 ppc64le s390x x86_64
-%endif
+ExclusiveArch: %{rust_arches}
 Summary: Authoritative DNS server for A/AAAA container records
-URL: https://github.com/containers/%{name}
-# Tarballs fetched from upstream's release page
+URL: https://github.com/containers/aardvark-dns
 Source0: %{url}/archive/v%{version}.tar.gz
 Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
 BuildRequires: cargo
 BuildRequires: git-core
 BuildRequires: make
-%if %{defined rhel}
-# rust-toolset requires the `local` repo enabled on non-koji ELN build environments
-BuildRequires: rust-toolset
-%else
-BuildRequires: rust-packaging
 BuildRequires: rust-srpm-macros
-%endif
+Conflicts: netavark < %{epoch}:%{version}

 %description
 %{summary}
@ -59,188 +24,101 @@ Forwards other request to configured resolvers.
 Read more about configuration in `src/backend/mod.rs`.

 %prep
-%autosetup -Sgit %{name}-%{version}
-# Following steps are only required on environments like koji which have no
-# network access and thus depend on the vendored tarball. Copr pulls
-# dependencies directly from the network.
-%if !%{defined copr_username}
+%autosetup -Sgit
 tar fx %{SOURCE1}
-%if 0%{?fedora} || 0%{?rhel} >= 10
-%cargo_prep -v vendor
-%else
-%cargo_prep -V 1
-%endif
-%endif
+mkdir -p .cargo
+
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+
+[net]
+offline = true
+EOF

 %build
-%{__make} CARGO="%{__cargo}" build
-%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
-%cargo_license_summary
-%{cargo_license} > LICENSE.dependencies
-%cargo_vendor_manifest
-%endif
+%{__make} build

 %install
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install

 %files
 %license LICENSE
-%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
-%license LICENSE.dependencies
-%license cargo-vendor.txt
-%endif
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}

 %changelog
-## START: Generated by rpmautospec
-* Wed Nov 13 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.13.1-1
- aardvark-dns-1.13.1-1.el10
- update to https://github.com/containers/aardvark-dns/releases/tag/v1.13.1
- Related: RHEL-58990
-
-* Wed Oct 30 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.13.0-1
- aardvark-dns-1.13.0-1.el10
- update to https://github.com/containers/aardvark-dns/releases/tag/v1.13.0
- Resolves: RHEL-65320
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2:1.12.2-2
- Bump release for October 2024 mass rebuild:
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2:1.12.2-1
- Rebuilt for MSVSphere 10
-
 * Wed Sep 04 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.12.2-1
- Update to 1.12.2 upstream release
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.12.2
+- Related: RHEL-27608

 * Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.12.1-1
- Update to 1.12.1 upstream release
-
-* Fri Jul 19 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-1
- Remove autorelease and bump Epoch Related: RHEL-32374
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.11.0-3
- Bump release for June 2024 mass rebuild
-
-* Tue Jun 04 2024 Jindrich Novy <jnovy@redhat.com> - 1.11.0-2
- Add gating.yaml, Related: RHEL-39410
-
-* Fri May 31 2024 Jindrich Novy <jnovy@redhat.com> - 1.11.0-1
- Update to 1.11.0 upstream release
-
-* Wed Jan 24 2024 Packit <hello@packit.dev> - 1.10.0-1
- [packit] 1.10.0 upstream release
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Nov 27 2023 Packit <hello@packit.dev> - 1.9.0-1
- [packit] 1.9.0 upstream release
-
-* Wed Sep 27 2023 Packit <hello@packit.dev> - 1.8.0-1
- [packit] 1.8.0 upstream release
-
-* Tue Aug 22 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.7.0-3
- spdx compatible license field
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 29 2023 Packit <hello@packit.dev> - 1.7.0-1
- [packit] 1.7.0 upstream release
-
-* Wed Apr 12 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.6.0-1
- bump to v1.6.0
-
-* Mon Mar 06 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-6
- exclusivearch: golang_arches_future
-
-* Mon Mar 06 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-5
- migrated to SPDX license
-
-* Wed Feb 08 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-4
- Discontinue i686
-
-* Tue Feb 07 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-3
- BR: rust-packaging
-
-* Tue Feb 07 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-2
- Enable debuginfo
-
-* Thu Feb 02 2023 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.5.0-1
- bump to v1.5.0
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Dec 12 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.4.0-1
- auto bump to v1.4.0
-
-* Tue Nov 15 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.3.0-1
- auto bump to v1.3.0
-
-* Fri Oct 21 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-6
- rebuild
-
-* Fri Oct 07 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-5
- Revert "auto bump to v1.2.0"
-
-* Fri Oct 07 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.0-4
- auto bump to v1.2.0
-
-* Tue Oct 04 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-3
- adjust macros to get correct version
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.12.1
+- Related: RHEL-27608

-* Tue Oct 04 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.2.0-2
- get rid of debbuild to comply with fedora guidelines
+* Mon Jun 03 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.11.0
+- Related: RHEL-27608

-* Tue Sep 27 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.2.0-1
- auto bump to v1.2.0
+* Mon Apr 08 2024 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.10.0-2
+- rebuild for gating tests
+- Related: RHEL-31950

-* Wed Aug 17 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.1.0-3
- use easier tag macros to make both fedora and debbuild happy
+* Wed Jan 24 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: RHEL-2112

-* Tue Aug 16 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.1.0-2
- Fix debbuild maintainer issue
+* Wed Dec 06 2023 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.9.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.9.0
+- Related: Jira:RHEL-2112

-* Thu Jul 28 2022 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1.1.0-1
- auto bump to v1.1.0
+* Fri Sep 29 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.8.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.8.0
+- Related: Jira:RHEL-2112

-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+* Fri Jul 07 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.7.0
+- Related: #2176063

-* Fri May 27 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.3-2
- build dep packages using debbuild
+* Wed Apr 12 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.6.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.6.0
+- Related: #2176063

-* Fri May 06 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.3-1
- bump to v1.0.3
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
+- build always offline
+- Related: #2124478

-* Wed Mar 23 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.2-1
- bump to v1.0.2
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.5.0
+- Related: #2124478

-* Fri Feb 25 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.1-2
- upload tarballs to lookaside cache
+* Thu Dec 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.4.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.4.0
+- Related: #2124478

-* Fri Feb 25 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.1-1
- bump to v1.0.1
- packaging changes to account for upstream separation of vendor dir
- reuse upstream provided vendor dir
+* Wed Nov 16 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.3.0-1
+- update to https://github.com/containers/aardvark-dns/releases/tag/v1.3.0
+- Related: #2124478

-* Wed Feb 16 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0-1
- bump to v1.0.0
+* Tue Oct 18 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: #2124478

-* Thu Feb 10 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0~rc2-1
- bump to v1.0.0-rc2
+* Wed Aug 24 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-4
+- remove windows binaries and regenerate vendor tarball
+- Related: #2061316

-* Thu Feb 03 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0~rc1-2
- upload source to lookaside cache
+* Tue Aug 23 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-3
+- conflict with older versions than aardvark-dns itself
+- Related: #2061316

-* Thu Feb 03 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1.0.0~rc1-1
- bump to v1.0.0-rc1
+* Thu Aug 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-2
+- add Epoch to preserve upgrade path
+- Related: #2061316

-* Thu Jan 27 2022 Lokesh Mandvekar <lsm5@fedoraproject.org> - 0-1
- Resolves: #2043581 - initial build
-## END: Generated by rpmautospec
+* Wed Aug 3 2022 Jindrich Novy <jnovy@redhat.com> 1.1.0-1
+- initial import
+- Related: #2061316