From 7d95403b8fbd72e151a1f41fb6988d1d24bf88d7 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Mon, 5 Aug 2024 08:04:47 +0200
Subject: [PATCH] Update to 1.12.1 upstream release

Upstream tag: v1.12.1
Upstream commit: a4e1359e

Commit authored by Packit automation (https://packit.dev/)
---
 .gitignore    |  2 ++
 README.packit |  2 +-
 netavark.spec | 36 +++++++++++++++++++++++-------------
 sources       |  4 ++--
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5eb9d1..089b969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@
 /netavark-v1.10.3-vendor.tar.gz
 /v1.11.0.tar.gz
 /netavark-v1.11.0-vendor.tar.gz
+/v1.12.1.tar.gz
+/netavark-v1.12.1-vendor.tar.gz
diff --git a/README.packit b/README.packit
index 3976d54..bd4a9c5 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.97.1.
+The file was generated using packit 0.99.0.
diff --git a/netavark.spec b/netavark.spec
index 5c4a860..54daee3 100644
--- a/netavark.spec
+++ b/netavark.spec
@@ -14,10 +14,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
@@ -30,8 +30,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}
@@ -49,6 +49,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
@@ -90,19 +95,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}
@@ -120,6 +126,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*
diff --git a/sources b/sources
index a3472b7..6daf516 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v1.11.0.tar.gz) = d10f0c70655c4ff38f68c0bb1037d9bd193ae56739d80afb3bd8791943b3c47bdba26bd6c102360f8e98e519105effb43cb84439fa44358d640f40e99fe3827f
-SHA512 (netavark-v1.11.0-vendor.tar.gz) = d858bddaaf41b284af9ede84a4d3aab5b5935ea83df5261dfa58e2b7d14962dd55983b1a95b2692e323ea40fc2dc4d9b1bdf2aed90644739e6333c794a7915cb
+SHA512 (v1.12.1.tar.gz) = 5841397f7ccdbe6a757fb46878af76dfd65bb8d954428ab644793bf0617a115b65f97aba4e39175e287e321ffbeb165d63edbf37ec13466a69772b0fee21cf4a
+SHA512 (netavark-v1.12.1-vendor.tar.gz) = f27128df051eeb707d41d0b31dc25ecd53c0f0358a0ffbee672328086982859397d114aea8e54c2630c1cfec14966e35a790a1178723ddd948b9e8df248ccf61