diff --git a/.gitignore b/.gitignore index d9622b0..1deb378 100644 --- a/.gitignore +++ b/.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 diff --git a/.netavark.metadata b/.netavark.metadata index 44ab5f1..b2f5aef 100644 --- a/.netavark.metadata +++ b/.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 diff --git a/SPECS/netavark.spec b/SPECS/netavark.spec index d86450c..4334d0a 100644 --- a/SPECS/netavark.spec +++ b/SPECS/netavark.spec @@ -1,10 +1,14 @@ # 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: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 and BSD and MIT ExclusiveArch: %{rust_arches} # this is needed for go-md2man @@ -13,7 +17,11 @@ ExclusiveArch: %{go_arches} ExcludeArch: i686 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 BuildRequires: cargo BuildRequires: /usr/bin/go-md2man @@ -47,7 +55,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 @@ -82,6 +94,10 @@ go-md2man -in %{name}.1.md -out %{name}.1 %{_mandir}/man1/%{name}.1* %changelog +* Thu Apr 20 2023 Jindrich Novy - 2:1.5.0-3 +- fix --dns-add command is not functioning +- Resolves: #2182898 + * Fri Feb 03 2023 Jindrich Novy - 2:1.5.0-2 - fix build - thank to Paul Holzinger - Related: #2124478