From 42f86f132db8ac4ee1aec0b8fe8a7c3bda1adb90 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Mon, 21 Mar 2022 12:41:46 +0100
Subject: [PATCH] containers-common-1-33.el9

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

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 containers-common.spec | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index cdff741..b39e535 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 32%{?dist}
+Release: 33%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildRequires: /usr/bin/go-md2man
@@ -62,15 +62,25 @@ Source101: update-vendored.sh
 Source102: pyxis.sh
 
 %global aardvark_dns_version v1.0.1
+#%%global aardvark_dns_branch v1.0.1-rhel
 %global aardvark_dns_commit0 da6bc98b1b795d8ca4f4c77a7dbe383f5a62c6f5
 %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
 
 %global netavark_version v1.0.1
+#%%global netavark_branch v1.0.1-rhel
 %global netavark_commit0 5810f9fec619ddf3c95737f9ba26c67f43a6c88c
 %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
 
 %description
@@ -83,7 +93,7 @@ separately.
 
 %package -n aardvark-dns
 Version: 1.0.1
-Release: 32%{?dist}
+Release: 33%{?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
@@ -103,7 +113,7 @@ Read more about configuration in `src/backend/mod.rs`.
 
 %package -n netavark
 Version: 1.0.1
-Release: 32%{?dist}
+Release: 33%{?dist}
 URL: https://github.com/containers/netavark
 Summary: OCI network stack
 License: ASL 2.0 and BSD and MIT
@@ -290,6 +300,10 @@ EOF
 %{_mandir}/man1/netavark.1*
 
 %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
 - build rust packages with RUSTFLAGS set to make ExecShield happy (Lokesh Mandvekar)
 - Related: #2000051