diff --git a/201.patch b/201.patch new file mode 100644 index 0000000..5dc70ed --- /dev/null +++ b/201.patch @@ -0,0 +1,26 @@ +From a34a32a9faea832f378f67d5121f430d0b96a925 Mon Sep 17 00:00:00 2001 +From: Aditya R +Date: Tue, 23 Aug 2022 22:23:48 +0530 +Subject: [PATCH] makefile: remove windows specific libaries from vendor + +Modify `vendor-rm-windows` to remove windows specific libaries from +vendor directory + +Signed-off-by: Aditya R +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 411203a..75ba52d 100644 +--- a/Makefile ++++ b/Makefile +@@ -109,6 +109,8 @@ vendor: ## vendor everything into vendor/ + vendor-rm-windows: + if [ -d "vendor/winapi" ]; then \ + rm -fr vendor/winapi*gnu*/lib/*.a; \ ++ rm -fr vendor/windows*/lib/*.a; \ ++ rm -fr vendor/windows*/lib/*.lib; \ + fi + + .PHONY: vendor-tarball diff --git a/aardvark-dns.spec b/aardvark-dns.spec index e86a778..1d35053 100644 --- a/aardvark-dns.spec +++ b/aardvark-dns.spec @@ -5,12 +5,13 @@ Epoch: 2 Name: aardvark-dns Version: 1.1.0 License: ASL 2.0 and BSD and MIT -Release: 3%{?dist} +Release: 4%{?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 Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz +Patch0: https://patch-diff.githubusercontent.com/raw/containers/aardvark-dns/pull/201.patch BuildRequires: cargo BuildRequires: git-core BuildRequires: make @@ -48,6 +49,10 @@ EOF %{_libexecdir}/podman/%{name} %changelog +* Wed Aug 24 2022 Jindrich Novy - 2:1.1.0-4 +- remove windows binaries and regenerate vendor tarball +- Related: #2061316 + * Tue Aug 23 2022 Jindrich Novy - 2:1.1.0-3 - conflict with older versions than aardvark-dns itself - Related: #2061316 diff --git a/sources b/sources index 1b8d3a2..cd4cbb5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (aardvark-dns-v1.1.0-vendor.tar.gz) = b2c28eb900efc0a4b1c9d39db334ee4613c518689b5a86ea97b8d543ab69331c07c02963339f7c91ec0a2510f8cad0e7efcd4db570f9ed3df77953a85bf91ee2 SHA512 (v1.1.0.tar.gz) = 96acfac34f6cb894dc7ea170d74de6342da95d345f4109703e0d57ff98662968251fafde8e8a4f5c047a6ff4725ca632b598d024b6660d7dc4a07afeffdee26a +SHA512 (aardvark-dns-v1.1.0-vendor.tar.gz) = e2d1ea48ef1435481607069e4784bde492a17eb79feeee0df8b28b5efd3445e6744bcd815844dff6d69a25d110c2e2f128185662c205d83d58a06514da5c1749