Skip to content
Snippets Groups Projects
Commit c058337f authored by Rocky Automation's avatar Rocky Automation :tv:
Browse files

import netavark-1.12.1-1.el10

parent d53732a3
No related branches found
Tags imports/r9-beta/netavark-1.5.0-2.el9
No related merge requests found
24500ccc9d0cd3bfaa63915b5a95e445d11e2fb66e222e9d5acc30af5f439703 SOURCES/netavark-v1.11.0-vendor.tar.gz c55950b5fe12a0ffde6b184a95464b825027dba90548ebc53e6c64fd8377ed5c SOURCES/netavark-v1.12.1-vendor.tar.gz
5b96e5a00a41a550d716f1e5c180df6e0ee5b0ce20961827ef17aff3d6a92f9c SOURCES/v1.11.0.tar.gz 71e44922204da923b9f03b1306b9b0ba82673a201f3d96afc544f4ccdd4824d3 SOURCES/v1.12.1.tar.gz
...@@ -19,10 +19,10 @@ ...@@ -19,10 +19,10 @@
# Minimum X.Y dep for aardvark-dns # Minimum X.Y dep for aardvark-dns
%define major_minor %((v=%{version}; echo ${v%.*})) %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 # and default to iptables on all other environments
# The `rhel` macro is defined on CentOS Stream, RHEL as well as Fedora ELN. # 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 %define default_fw nftables
%else %else
%define default_fw iptables %define default_fw iptables
...@@ -35,8 +35,8 @@ Epoch: 102 ...@@ -35,8 +35,8 @@ Epoch: 102
%else %else
Epoch: 2 Epoch: 2
%endif %endif
Version: 1.11.0 Version: 1.12.1
Release: 4%{?dist} Release: 1%{?dist}
# The `AND` needs to be uppercase in the License for SPDX compatibility # The `AND` needs to be uppercase in the License for SPDX compatibility
License: Apache-2.0 AND BSD-3-Clause AND MIT License: Apache-2.0 AND BSD-3-Clause AND MIT
%if %{defined golang_arches_future} %if %{defined golang_arches_future}
...@@ -54,6 +54,11 @@ BuildRequires: %{_bindir}/go-md2man ...@@ -54,6 +54,11 @@ BuildRequires: %{_bindir}/go-md2man
# aardvark-dns and %%{name} are usually released in sync # aardvark-dns and %%{name} are usually released in sync
Requires: aardvark-dns >= %{epoch}:%{major_minor} Requires: aardvark-dns >= %{epoch}:%{major_minor}
Provides: container-network-stack = 2 Provides: container-network-stack = 2
%if "%{default_fw}" == "nftables"
Requires: nftables
%else
Requires: iptables
%endif
BuildRequires: make BuildRequires: make
BuildRequires: protobuf-c BuildRequires: protobuf-c
BuildRequires: protobuf-compiler BuildRequires: protobuf-compiler
...@@ -95,19 +100,20 @@ Its features include: ...@@ -95,19 +100,20 @@ Its features include:
# dependencies directly from the network. # dependencies directly from the network.
%if !%{defined copr_username} %if !%{defined copr_username}
tar fx %{SOURCE1} tar fx %{SOURCE1}
mkdir -p .cargo %if 0%{?fedora} || 0%{?rhel} >= 10
%cargo_prep -v vendor
cat >.cargo/config << EOF %else
[source.crates-io] %cargo_prep -V 1
replace-with = "vendored-sources" %endif
[source.vendored-sources]
directory = "vendor"
EOF
%endif %endif
%build %build
NETAVARK_DEFAULT_FW=%{default_fw} %{__make} CARGO="%{__cargo}" 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 cd docs
%{__make} %{__make}
...@@ -125,6 +131,10 @@ cd docs ...@@ -125,6 +131,10 @@ cd docs
%files %files
%license LICENSE %license LICENSE
%if (0%{?fedora} || 0%{?rhel} >= 10) && !%{defined copr_username}
%license LICENSE.dependencies
%license cargo-vendor.txt
%endif
%dir %{_libexecdir}/podman %dir %{_libexecdir}/podman
%{_libexecdir}/podman/%{name}* %{_libexecdir}/podman/%{name}*
%{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}.1*
...@@ -134,6 +144,9 @@ cd docs ...@@ -134,6 +144,9 @@ cd docs
%changelog %changelog
## START: Generated by rpmautospec ## 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 * Fri Jul 19 2024 Jindrich Novy <jnovy@redhat.com> - 2:1.11.0-2
- Remove autorelease - Related: RHEL-32374 - Remove autorelease - Related: RHEL-32374
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment