From a720aa6e0f738a20c463573e0eabf97d82605966 Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Tue, 12 Dec 2023 20:08:57 +0000
Subject: [PATCH] import netavark-1.7.0-2.el9_3
---
.netavark.checksum | 2 +-
.netavark.metadata | 2 +-
SPECS/netavark.spec | 23 ++++++++++++++++++++---
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/.netavark.checksum b/.netavark.checksum
index 0e59985..9978ad8 100644
--- a/.netavark.checksum
+++ b/.netavark.checksum
@@ -1 +1 @@
-a5f61e1d12bccd93bbf7520f3c28cbf6e248a14f216de8d1c8de6f835a60164d
+951f8c8aa010c48b466e93ab1272d4926f24b235bd15d9862c1675791ddde51f
diff --git a/.netavark.metadata b/.netavark.metadata
index f95318d..ffdc479 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 5d9ac1a..51cf6e8 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.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}
# 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
@@ -83,6 +95,11 @@ go-md2man -in %{name}.1.md -out %{name}.1
%{_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-16300
+
* 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: #2176063
--
GitLab