From 32f8d395aa06378fada3553870fdf38786df848b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 16 2023 06:12:35 +0000
Subject: import netavark-1.5.0-4.module+el8.8.0+18060+3f21f2cc


---

diff --git a/.gitignore b/.gitignore
index d7f4a2a..d9622b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/netavark-v1.1.0-vendor.tar.gz
-SOURCES/v1.1.0-rhel-e868e02.tar.gz
+SOURCES/1.5.0.tar.gz
+SOURCES/netavark-v1.5.0-vendor.tar.gz
diff --git a/.netavark.metadata b/.netavark.metadata
index 74d07bc..44ab5f1 100644
--- a/.netavark.metadata
+++ b/.netavark.metadata
@@ -1,2 +1,2 @@
-715b18551c34835b47e0861a09a2baa8d3aa23dd SOURCES/netavark-v1.1.0-vendor.tar.gz
-99af68089204eb3e5ba6fc93722137799454733f SOURCES/v1.1.0-rhel-e868e02.tar.gz
+beb751742ed33f7748cef4babd55fa4805314089 SOURCES/1.5.0.tar.gz
+dd7b20c3e2138a665742dac7219de3365cb7ef44 SOURCES/netavark-v1.5.0-vendor.tar.gz
diff --git a/SPECS/netavark.spec b/SPECS/netavark.spec
index f141691..6dc4fde 100644
--- a/SPECS/netavark.spec
+++ b/SPECS/netavark.spec
@@ -1,25 +1,16 @@
 # debuginfo doesn't work yet
 %global debug_package %{nil}
 
-%global netavark_version v1.1.0
-%global netavark_branch v1.1.0-rhel
-%global netavark_commit0 e868e02552bd1be28d8eb6a193f2e92b0e0643bf
-%global netavark_shortcommit0 %(c=%{netavark_commit0}; echo ${c:0:7})
-
 Epoch: 2
 Name: netavark
-Version: 1.1.0
-Release: 7%{?dist}
+Version: 1.5.0
+Release: 4%{?dist}
 License: ASL 2.0 and BSD and MIT
 ExclusiveArch: %{rust_arches}
 Summary: OCI network stack
 URL: https://github.com/containers/%{name}
-%if 0%{?netavark_branch:1}
-Source0: https://github.com/containers/netavark/tarball/%{netavark_commit0}/%{netavark_branch}-%{netavark_shortcommit0}.tar.gz
-%else
-Source0: https://github.com/containers/netavark/archive/%{netavark_commit0}/netavark-%{netavark_version}-%{netavark_shortcommit0}.tar.gz
-%endif
-Source1: https://github.com/containers/netavark/releases/download/%{netavark_version}/netavark-%{netavark_version}-vendor.tar.gz
+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
 Recommends: aardvark-dns >= 1.0.3
@@ -27,6 +18,11 @@ Provides: container-network-stack = 2
 BuildRequires: make
 BuildRequires: rust-srpm-macros
 BuildRequires: git-core
+BuildRequires: protobuf-compiler
+BuildRequires: protobuf-c
+BuildRequires: gcc
+# https://github.com/containers/netavark/issues/578
+ExcludeArch: i686
 
 %description
 %{summary}
@@ -49,13 +45,7 @@ Its features include:
 * Support for container DNS resolution via aardvark-dns.
 
 %prep
-tar fx %{SOURCE0}
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
-
+%autosetup -Sgit
 tar fx %{SOURCE1}
 mkdir -p .cargo
 
@@ -63,45 +53,60 @@ cat >.cargo/config << EOF
 [source.crates-io]
 replace-with = "vendored-sources"
 
+[net]
+offline = true
+
+[source."https://github.com/containers/netavark-dhcp-proxy"]
+git = "https://github.com/containers/netavark-dhcp-proxy"
+replace-with = "vendored-sources"
+
 [source.vendored-sources]
 directory = "vendor"
 EOF
 
 %build
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
-%__scm_setup_git -q
 %{__make} build
 
 cd docs
 cp %{SOURCE2} .
 
 %install
-%if 0%{?netavark_branch:1}
-pushd containers-netavark-%{netavark_shortcommit0}
-%else
-pushd netavark-%{netavark_commit0}
-%endif
 %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 
 %files
-%if 0%{?netavark_branch:1}
-%license containers-netavark-%{netavark_shortcommit0}/LICENSE
-%else
-%license netavark-%{netavark_commit0}/LICENSE
-%endif
+%license LICENSE
 %dir %{_libexecdir}/podman
 %{_libexecdir}/podman/%{name}
 %{_mandir}/man1/%{name}.1*
 
 %changelog
-* Tue Oct 25 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-7
-- fix "Two aardvark-dns instances trying to use the same port
-  on the same interface"
-- Resolves: #2130234
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-4
+- exclude i686
+- Related: #2123641
+
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-3
+- update build parameters
+- Related: #2123641
+
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-2
+- always stay offline during build
+- Related: #2123641
+
+* Fri Feb 03 2023 Jindrich Novy <jnovy@redhat.com> - 2:1.5.0-1
+- update to https://github.com/containers/netavark/releases/tag/v1.5.0
+- Related: #2123641
+
+* Thu Dec 08 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.4.0-1
+- update to https://github.com/containers/netavark/releases/tag/v1.4.0
+- Related: #2123641
+
+* Mon Nov 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.3.0-1
+- update to https://github.com/containers/netavark/releases/tag/v1.3.0
+- Related: #2123641
+
+* Wed Sep 28 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.2.0-1
+- update to https://github.com/containers/netavark/releases/tag/v1.2.0
+- Resolves: #2116481
 
 * Tue Aug 09 2022 Jindrich Novy <jnovy@redhat.com> - 2:1.1.0-6
 - bump Epoch to preserve upgrade path