From c058337f9389c9c9b9cbd9c7f1b546fac053477e Mon Sep 17 00:00:00 2001
From: Peridot Bot <rockyautomation@rockylinux.org>
Date: Mon, 5 Aug 2024 08:07:07 +0000
Subject: [PATCH] import netavark-1.12.1-1.el10
---
.netavark.metadata | 4 ++--
SPECS/netavark.spec | 39 ++++++++++++++++++++++++++-------------
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/.netavark.metadata b/.netavark.metadata
index 3d6bd1c..90fa050 100644
--- a/.netavark.metadata
+++ b/.netavark.metadata
@@ -1,2 +1,2 @@
-24500ccc9d0cd3bfaa63915b5a95e445d11e2fb66e222e9d5acc30af5f439703 SOURCES/netavark-v1.11.0-vendor.tar.gz
-5b96e5a00a41a550d716f1e5c180df6e0ee5b0ce20961827ef17aff3d6a92f9c SOURCES/v1.11.0.tar.gz
+c55950b5fe12a0ffde6b184a95464b825027dba90548ebc53e6c64fd8377ed5c SOURCES/netavark-v1.12.1-vendor.tar.gz
+71e44922204da923b9f03b1306b9b0ba82673a201f3d96afc544f4ccdd4824d3 SOURCES/v1.12.1.tar.gz
diff --git a/SPECS/netavark.spec b/SPECS/netavark.spec
index 600bbc8..5c8b400 100644
--- a/SPECS/netavark.spec
+++ b/SPECS/netavark.spec
@@ -19,10 +19,10 @@
# Minimum X.Y dep for aardvark-dns
%define major_minor %((v=%{version}; echo ${v%.*}))
-# Set default firewall to nftables on CentOS Stream 10+, RHEL 10+
+# Set default firewall to nftables on CentOS Stream 10+, RHEL 10+, Fedora 41+
# and default to iptables on all other environments
# The `rhel` macro is defined on CentOS Stream, RHEL as well as Fedora ELN.
-%if %{defined rhel} && 0%{?rhel} >= 10
+%if (%{defined rhel} && 0%{?rhel} >= 10) || (%{defined fedora} && 0%{?fedora} >= 41)
%define default_fw nftables
%else
%define default_fw iptables
@@ -35,8 +35,8 @@ Epoch: 102
%else
Epoch: 2
%endif
-Version: 1.11.0
-Release: 4%{?dist}
+Version: 1.12.1
+Release: 1%{?dist}
# The `AND` needs to be uppercase in the License for SPDX compatibility
License: Apache-2.0 AND BSD-3-Clause AND MIT
%if %{defined golang_arches_future}
@@ -54,6 +54,11 @@ BuildRequires: %{_bindir}/go-md2man
# aardvark-dns and %%{name} are usually released in sync
Requires: aardvark-dns >= %{epoch}:%{major_minor}
Provides: container-network-stack = 2
+%if "%{default_fw}" == "nftables"
+Requires: nftables
+%else
+Requires: iptables
+%endif
BuildRequires: make
BuildRequires: protobuf-c
BuildRequires: protobuf-compiler
@@ -95,19 +100,20 @@ Its features include:
# dependencies directly from the network.
%if !%{defined copr_username}
tar fx %{SOURCE1}
-mkdir -p .cargo
-
-cat >.cargo/config << EOF
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
-EOF
+%if 0%{?fedora} || 0%{?rhel} >= 10
+%cargo_prep -v vendor
+%else
+%cargo_prep -V 1
+%endif
%endif
%build
NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" build
+%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
+%cargo_vendor_manifest
+%endif
cd docs
%{__make}
@@ -125,6 +131,10 @@ cd docs
%files
%license LICENSE
+%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
+%license LICENSE.dependencies
+%license cargo-vendor.txt
+%endif
%dir %{_libexecdir}/podman
%{_libexecdir}/podman/%{name}*
%{_mandir}/man1/%{name}.1*
@@ -134,6 +144,9 @@ cd docs
%changelog
## START: Generated by rpmautospec
+* Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.12.1-1
+- Update to 1.12.1 upstream release
+
* Fri Jul 19 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-2
- Remove autorelease - Related: RHEL-32374
--
GitLab