diff --git a/.netavark.checksum b/.netavark.checksum index 54495baf385b08cfc246a8116667929d5c223345..ec823cb687db8d55b9d3c7e68a84ae694d23ecb4 100644 --- a/.netavark.checksum +++ b/.netavark.checksum @@ -1 +1 @@ -Direct Git Import +212963709233115f6ba03763616e9eae4d9243aef030a2e5ef9131d1e6a5fc73 diff --git a/.netavark.metadata b/.netavark.metadata index f95318df9d546894ef3af22d8dd0d63fe2834c3b..ffdc47912dd6df98458ce7575fd290b82262d170 100644 --- a/.netavark.metadata +++ b/.netavark.metadata @@ -1,2 +1,2 @@ -b0ed7d80fd96ef2af88e7a001d91024919125e5842d9772de94648044630e116 SOURCES/1.7.0.tar.gz 463f26bd4d619619b5cc14b34496e3910e3e4e15f017094666beb2ed412c076f SOURCES/netavark-v1.7.0-vendor.tar.gz +2a70691b49978657fd8e7b67410f2552423cfdc62b3495cc91faf89192df1b16 SOURCES/v1.7.0-rhel-4335c93.tar.gz diff --git a/SPECS/netavark.spec b/SPECS/netavark.spec index eccd6b7df8aa39e3011f07b3d344e85f4b444237..1804bc57138ac20703f925b5e7c121ba94626a40 100644 --- a/SPECS/netavark.spec +++ b/SPECS/netavark.spec @@ -1,15 +1,23 @@ # debuginfo doesn't work yet %global debug_package %{nil} +%global branch v1.7.0-rhel +%global commit0 4335c93224d9667f62e9ba382d9eae314a19c706 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + Epoch: 2 Name: netavark Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?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 @@ -81,6 +93,11 @@ cp %{SOURCE2} . %{_mandir}/man1/%{name}.1* %changelog +* Wed Nov 15 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-2 +- update to the latest content of https://github.com/containers/netavark/tree/v1.7.0-rhel + (https://github.com/containers/netavark/commit/4335c93) +- Resolves: RHEL-16299 + * Mon Jul 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.7.0-1 - update to https://github.com/containers/netavark/releases/tag/v1.7.0 - Related: #2176055