From 22b13748afc059d314d9b2f2fa689cf0b09254e4 Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Wed, 22 May 2024 08:10:01 +0000
Subject: [PATCH] import netavark-1.10.3-1.module+el8.10.0+1712+34236d6d
---
.netavark.checksum | 2 +-
.netavark.metadata | 4 +--
SPECS/netavark.spec | 59 +++++++++++++++++++++++++++++----------------
3 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/.netavark.checksum b/.netavark.checksum
index ec823cb..b64c486 100644
--- a/.netavark.checksum
+++ b/.netavark.checksum
@@ -1 +1 @@
-212963709233115f6ba03763616e9eae4d9243aef030a2e5ef9131d1e6a5fc73
+83fbf80f6ae6fe503bb9bfc6451dbad84d6c42f64f05d72fc1cd117101b0c821
diff --git a/.netavark.metadata b/.netavark.metadata
index ffdc479..26ccb1f 100644
--- a/.netavark.metadata
+++ b/.netavark.metadata
@@ -1,2 +1,2 @@
-463f26bd4d619619b5cc14b34496e3910e3e4e15f017094666beb2ed412c076f SOURCES/netavark-v1.7.0-vendor.tar.gz
-2a70691b49978657fd8e7b67410f2552423cfdc62b3495cc91faf89192df1b16 SOURCES/v1.7.0-rhel-4335c93.tar.gz
+fdc3010cb221f0fcef0302f57ef6f4d9168a61f9606238a3e1ed4d2e348257b7 SOURCES/1.10.3.tar.gz
+e8bcbfa09015c0dcd1ea48705c862425437f1b0c600d943bc0ea43bd530f6839 SOURCES/netavark-v1.10.3-vendor.tar.gz
diff --git a/SPECS/netavark.spec b/SPECS/netavark.spec
index 1804bc5..025818b 100644
--- a/SPECS/netavark.spec
+++ b/SPECS/netavark.spec
@@ -1,23 +1,15 @@
# 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: 2%{?dist}
+Version: 1.10.3
+Release: 1%{?dist}
License: ASL 2.0 and BSD and MIT
ExclusiveArch: %{rust_arches}
Summary: OCI network stack
URL: https://github.com/containers/%{name}
-%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
+Source0: %{url}/archive/v%{version}/%{version}.tar.gz
Source1: %{url}/releases/download/v%{version}/%{name}-v%{version}-vendor.tar.gz
Source2: netavark.1
BuildRequires: cargo
@@ -25,6 +17,7 @@ Recommends: aardvark-dns >= 1.0.3
Provides: container-network-stack = 2
BuildRequires: make
BuildRequires: rust-srpm-macros
+BuildRequires: systemd-rpm-macros
BuildRequires: git-core
BuildRequires: protobuf-compiler
BuildRequires: protobuf-c
@@ -53,15 +46,16 @@ Its features include:
* Support for container DNS resolution via aardvark-dns.
%prep
-%if 0%{?branch:1}
-%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
-%else
-%autosetup -Sgit -n %{name}-%{commit0}
-%endif
+%autosetup -Sgit
tar fx %{SOURCE1}
mkdir -p .cargo
cat >.cargo/config << EOF
+[source."git+https://github.com/namib-project/nftables-rs.git?rev=1b0c60b"]
+git = "https://github.com/namib-project/nftables-rs.git"
+rev = "1b0c60b"
+replace-with = "vendored-sources"
+
[source.crates-io]
replace-with = "vendored-sources"
@@ -89,14 +83,37 @@ cp %{SOURCE2} .
%license LICENSE
%dir %{_libexecdir}/podman
%{_libexecdir}/podman/%{name}
-/usr/lib/systemd/system/*
+%{_unitdir}/*
%{_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 Feb 12 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.3-1
+- update to https://github.com/containers/netavark/releases/tag/v1.10.3
+- Related: Jira:RHEL-2110
+
+* Thu Feb 01 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.2-1
+- update to https://github.com/containers/netavark/releases/tag/v1.10.2
+- Related: Jira:RHEL-2110
+
+* Fri Jan 26 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.1-1
+- update to https://github.com/containers/netavark/releases/tag/v1.10.1
+- Related: Jira:RHEL-2110
+
+* Thu Jan 25 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.10.0-1
+- update to https://github.com/containers/netavark/releases/tag/v1.10.0
+- Related: Jira:RHEL-2110
+
+* Thu Dec 07 2023 Lokesh Mandvekar <lsm5@redhat.com> - 2:1.9.0-1
+- update to https://github.com/containers/netavark/releases/tag/v1.9.0
+- Related: Jira:RHEL-2110
+
+* Fri Oct 06 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.8.0-2
+- fix directory for systemd units
+- Related: Jira:RHEL-2110
+
+* Fri Sep 29 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.8.0-1
+- update to https://github.com/containers/netavark/releases/tag/v1.8.0
+- Related: Jira:RHEL-2110
* 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
--
GitLab