From 7ce081c75c58898a96d5cae129fbc120f255e1d6 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 21 Feb 2023 17:32:58 +0100 Subject: [PATCH] Add ExclusiveArch to match Podman There's no golang on %ix86 from RHEL 9 onwards [1], and hence no podman either [2]. Recently, with Podman 4.4.1, there are also no new podman builds for %ix86 for Fedora 36 onwards [3]. Arguably, the podman change should have been limited to Fedora Rawhide, but it's probably not a big problem because there's no %ix86 install media for Fedora CoreOS, Silverblue or Workstation. Note that while %golang_arches on RHEL 9 doesn't include %arm, it's included in both %golang_arches and %golang_arches_future on Fedora. [1] go-rpm-macros commit b1500ff47ee8cdd1 https://src.fedoraproject.org/rpms/go-rpm-macros/c/b1500ff47ee8cdd1 [2] podman commit 555a5a504dd538d5 https://src.fedoraproject.org/rpms/podman/c/555a5a504dd538d5 [3] podman commit 313c3e86a81c69eb https://src.fedoraproject.org/rpms/podman/c/313c3e86a81c69eb --- toolbox.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/toolbox.spec b/toolbox.spec index b87d817..c3917d5 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -6,7 +6,7 @@ Version: 0.0.99.3 %global goipath github.com/containers/%{name} %gometa -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tool for containerized command line environments on Linux License: ASL 2.0 @@ -23,6 +23,12 @@ Patch101: toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch Patch102: toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch Patch103: toolbox-cmd-root-Work-around-Cobra-1.1.2-s-handling-of-usage.patch +%if 0%{?rhel} == 9 +ExclusiveArch: %{golang_arches} +%else +ExclusiveArch: %{golang_arches_future} +%endif + BuildRequires: gcc BuildRequires: go-md2man BuildRequires: golang >= 1.13 @@ -212,6 +218,9 @@ ln -s src/vendor vendor %changelog +* Tue Feb 21 2023 Debarshi Ray - 0.0.99.3-11 +- Add ExclusiveArch to match Podman + * Thu Feb 02 2023 Yaakov Selkowitz - 0.0.99.3-10 - Sync packaging changes from CentOS Stream