import netavark-1.5.0-5.module+el8.8.0+18690+20d279b6

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/1.5.0.tar.gz
 SOURCES/netavark-v1.5.0-vendor.tar.gz
+SOURCES/v1.5.0-530dacd.tar.gz

.netavark.metadata

@@ -1,2 +1,2 @@
-beb751742ed33f7748cef4babd55fa4805314089 SOURCES/1.5.0.tar.gz
 dd7b20c3e2138a665742dac7219de3365cb7ef44 SOURCES/netavark-v1.5.0-vendor.tar.gz
+ed8bf4060b7a8eff914736d9f073003469a13400 SOURCES/v1.5.0-530dacd.tar.gz

SPECS/netavark.spec

@@ -1,15 +1,23 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
+%global branch v1.5.0
+%global commit0 530dacd1ff48b2ad2b0cb1f1ee1ba78c8274a3b7
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
 Epoch: 2
 Name: netavark
 Version: 1.5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: ASL 2.0 and BSD and MIT
 ExclusiveArch: %{rust_arches}
 Summary: OCI network stack
 URL: https://github.com/containers/%{name}
-Source0: %{url}/archive/v%{version}/%{version}.tar.gz
+%if 0%{?branch:1}
+Source0: https://github.com/containers/%{name}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
+%else
+Source0: https://github.com/containers/%{name}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
+%endif
 Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
 Source2: netavark.1
 BuildRequires: cargo
@@ -45,7 +53,11 @@ Its features include:
 * Support for container DNS resolution via aardvark-dns.
 
 %prep
-%autosetup -Sgit
+%if 0%{?branch:1}
+%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
+%else
+%autosetup -Sgit -n %{name}-%{commit0}
+%endif
 tar fx %{SOURCE1}
 mkdir -p .cargo
 
@@ -80,9 +92,13 @@ cp %{SOURCE2} .
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2:1.5.0-4
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2:1.5.0-5
 - Rebuilt for MSVSphere 8.8
 
+* Thu Apr 20 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-5
+- fix --dns-add command is not functioning
+- Resolves: #2182897
+
 * Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-4
 - exclude i686
 - Related: #2123641