From 8c81c496b9ec63a4200f6f04f3e3a9524444083b Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 8 Feb 2023 20:45:41 +0530
Subject: [PATCH] Discontinue i686

Ref: https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval

Fix build issues with netavark-proxy dependency

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 netavark.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/netavark.spec b/netavark.spec
index f9fc8f2..aba33e3 100644
--- a/netavark.spec
+++ b/netavark.spec
@@ -12,21 +12,21 @@ Name: netavark
 Version: %{gen_version}
 Release: %autorelease
 License: ASL 2.0 and BSD and MIT
-ExclusiveArch: %{rust_arches}
+ExclusiveArch: %{arm32} %{arm64} ppc64le s390x x86_64
 Summary: OCI network stack
 URL: https://github.com/containers/%{name}
 # Tarballs fetched from upstream's release page
 Source0: %{url}/archive/%{built_tag}.tar.gz
 Source1: %{url}/releases/download/%{built_tag}/%{name}-%{built_tag}-vendor.tar.gz
 BuildRequires: cargo
-%ifarch %{golang_arches}
 BuildRequires: go-md2man
-%endif
 # aardvark-dns and %%{name} are usually released in sync
 Recommends: aardvark-dns >= %{version}-1
 Requires: (aardvark-dns >= %{version}-1 if fedora-release-identity-server)
 Provides: container-network-stack = 2
 BuildRequires: make
+BuildRequires: protobuf-c
+BuildRequires: protobuf-compiler
 BuildRequires: rust-srpm-macros
 BuildRequires: git-core
 # Generated using:
@@ -270,6 +270,10 @@ cat >.cargo/config << EOF
 [source.crates-io]
 replace-with = "vendored-sources"
 
+[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