From 5f9f5727d56e9d104778d4e2a25a5be48bb1c457 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Thu, 13 Aug 2026 10:54:54 +0200
Subject: [PATCH] update to 2.1.0

Resolves: RHEL-187024
Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 netavark.spec | 65 ++++++++++++++++++++++++++++++++-------------------
 sources       |  4 ++--
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/netavark.spec b/netavark.spec
index cc05857..819e09a 100644
--- a/netavark.spec
+++ b/netavark.spec
@@ -30,8 +30,8 @@ Epoch: 102
 %else
 Epoch: 4
 %endif
-Version: 2.0.0
-Release: 2%{?dist}
+Version: 2.1.0
+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}
@@ -55,7 +55,6 @@ Requires: nftables
 Requires: iptables
 %endif
 BuildRequires: make
-BuildRequires: protobuf-c
 BuildRequires: protobuf-compiler
 %if %{defined rhel}
 # rust-toolset requires the `local` repo enabled on non-koji ELN build environments
@@ -82,24 +81,32 @@ Its features include:
     including MACVLAN networks
 * All required firewall configuration to perform NAT and port
     forwarding as required for containers
-* Support for iptables, firewalld and nftables
+* Support for firewalld and nftables
 * Support for rootless containers
 * Support for IPv4 and IPv6
 * Support for container DNS resolution via aardvark-dns.
 
+# Only intended to be used for gating tests
+# End user usecases not supported
 %package tests
 Summary: Tests for %{name}
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: bats
-Requires: iproute
-Requires: jq
-Requires: firewalld
-Requires: nftables
+Recommends: bats
+Requires: bind-utils
 Requires: dbus-daemon
+Requires: dnsmasq
+Requires: firewalld
+Requires: jq
+Requires: net-tools
+Requires: nftables
+Requires: nmap-ncat
 
 %description tests
 %{summary}
 
+This package contains integration tests for %{name}. Only intended to be used for
+gating tests. Not supported for end users / customers.
+
 %prep
 %autosetup -Sgit %{name}-%{version}
 # Following steps are only required on environments like koji which have no
@@ -116,27 +123,30 @@ tar fx %{SOURCE1}
 
 %build
 NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" build
-# Build examples package for tests
-%{__make} CARGO="%{__cargo}" examples
 %if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
 %cargo_license_summary
 %{cargo_license} > LICENSE.dependencies
 %cargo_vendor_manifest
 %endif
 
+# Build examples package for tests
+%{__make} CARGO="%{__cargo}" examples
+
 cd docs
 %{__make}
 
 %install
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-# Install tests
-install -d %{buildroot}%{_datadir}/%{name}
-cp -r examples %{buildroot}%{_datadir}/%{name}/examples
-cp -r test %{buildroot}%{_datadir}/%{name}/test
-cp -r test-dhcp %{buildroot}%{_datadir}/%{name}/test-dhcp
-install -d %{buildroot}%{_libexecdir}/%{name}
-install -m 0755 bin/netavark-connection-tester %{buildroot}%{_libexecdir}/%{name}/
-install -m 0755 bin/netavark-dhcp-proxy-client %{buildroot}%{_libexecdir}/%{name}/
+
+%{__install} -d -p %{buildroot}%{_datadir}/%{name}/{examples,test,test-dhcp}
+%{__cp} -rpav targets/release/examples/* %{buildroot}%{_datadir}/%{name}/examples
+%{__cp} -rpav test/* %{buildroot}%{_datadir}/%{name}/test
+%{__cp} -rpav test-dhcp/* %{buildroot}%{_datadir}/%{name}/test-dhcp
+%{__install} -D -m0755 bin/netavark-connection-tester %{buildroot}%{_bindir}/netavark-connection-tester
+%{__install} -D -m0755 bin/netavark-dhcp-proxy-client %{buildroot}%{_libexecdir}/podman/netavark-dhcp-proxy-client
+
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test/tmt
+%{__rm} -rf %{buildroot}%{_datadir}/%{name}/test-dhcp/tmt
 
 %preun
 %systemd_preun %{name}-dhcp-proxy.service
@@ -164,14 +174,21 @@ install -m 0755 bin/netavark-dhcp-proxy-client %{buildroot}%{_libexecdir}/%{name
 %{_unitdir}/%{name}-nftables-reload.service
 
 %files tests
+%{_bindir}/netavark-connection-tester
+%{_libexecdir}/podman/netavark-dhcp-proxy-client
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/examples/
-%{_datadir}/%{name}/test/
-%{_datadir}/%{name}/test-dhcp/
-%{_libexecdir}/%{name}/netavark-connection-tester
-%{_libexecdir}/%{name}/netavark-dhcp-proxy-client
+%dir %{_datadir}/%{name}/examples
+%dir %{_datadir}/%{name}/test
+%dir %{_datadir}/%{name}/test-dhcp
+%{_datadir}/%{name}/examples/*
+%{_datadir}/%{name}/test/*
+%{_datadir}/%{name}/test-dhcp/*
 
 %changelog
+* Thu Aug 13 2026 Jindrich Novy <jnovy@redhat.com> - 4:2.1.0-1
+- update to https://github.com/containers/netavark/releases/tag/v2.1.0
+- Resolves: RHEL-187024
+
 * Wed Jul 22 2026 Jindrich Novy <jnovy@redhat.com> - 4:2.0.0-2
 - increase Epoch to preserve upgrade path from RHEL9 - Resolves: RHEL-213577
 
diff --git a/sources b/sources
index b31a10d..501d89f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (v2.0.0.tar.gz) = b2b04a3784bea78a18d7277f93aff3ec8296c6f8b7e97a72e8871e89f9628a739fecaae0db44f379f932c1223a19e6907a7fe53ba5143f7f7742606590613f8c
-SHA512 (netavark-v2.0.0-vendor.tar.gz) = 125dcded2218e183020582c2bb1778667d812cb5009c6264fec14b0500329c493a57a01f0c72e1e2d7cc2cfef4462b0ccc68af1b4f745e35bddbcc1550835509
+SHA512 (netavark-v2.1.0-vendor.tar.gz) = 175a93d38579bee64a9dcc1b834f5d229a8e3129184076ffe7e164a4a71ada514828ff8a63a78eaec0b607d89cabb045363ee86e11695122d76f99cc7bef1151
+SHA512 (v2.1.0.tar.gz) = d1fdfa398415e07fe9a653bcf92f74a6ebb0549f86240d2042af9874ce5135e9aecb16c54359ec3a0d600ce546f96901ea276da3a3379ebbe87faeed6bef9068