The package rpms/toolbox.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/toolbox.git/commit/?id=a5de73782ead3... https://src.fedoraproject.org/cgit/rpms/toolbox.git/commit/?id=ca45ccdce7381....
Change: -ExclusiveArch: %{golang_arches_future} +ExclusiveArch: %{golang_arches_future}
Thanks.
Full change: ============
commit a5de73782ead309457d5126aa87eccf5ba7e008d Author: Martin Jackson martjack@redhat.com Date: Wed Feb 22 08:48:32 2023 -0600
Fix the ExclusiveArch
The %gometa RPM macro also generates a ExclusiveArch on %golang_arches or %golang_arches_future depending on whether the -f flag is present or not. This was overriding the separately specified ExclusiveArch.
Fallout from ca45ccdce738113a67a8a110b4f099d12095aa47
https://src.fedoraproject.org/rpms/toolbox/pull-request/12
diff --git a/toolbox.spec b/toolbox.spec index 173f75d..121b8b3 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -4,9 +4,14 @@ Name: toolbox Version: 0.0.99.3
%global goipath github.com/containers/%{name} + +%if 0%{?rhel} == 9 %gometa +%else +%gometa -f +%endif
-Release: 9%{?dist} +Release: 10%{?dist} Summary: Tool for containerized command line environments on Linux
License: ASL 2.0 @@ -23,12 +28,6 @@ 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 @@ -218,6 +217,9 @@ ln -s src/vendor vendor
%changelog +* Wed Feb 22 2023 Martin Jackson mhjacks@swbell.net - 0.0.99.3-10 +- Fix the ExclusiveArch + * Tue Feb 21 2023 Debarshi Ray rishi@fedoraproject.org - 0.0.99.3-9 - Add ExclusiveArch to match Podman
commit ca45ccdce738113a67a8a110b4f099d12095aa47 Author: Debarshi Ray rishi@fedoraproject.org Date: Tue Feb 21 17:32:58 2023 +0100
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
diff --git a/toolbox.spec b/toolbox.spec index 77d0e87..173f75d 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -6,7 +6,7 @@ Version: 0.0.99.3 %global goipath github.com/containers/%{name} %gometa
-Release: 8%{?dist} +Release: 9%{?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 rishi@fedoraproject.org - 0.0.99.3-9 +- Add ExclusiveArch to match Podman + * Thu Feb 02 2023 Yaakov Selkowitz yselkowi@redhat.com - 0.0.99.3-8 - Sync packaging changes from CentOS Stream
commit fb48d51300573b73f80d7c50b3edaeca0ca01afd Author: Debarshi Ray rishi@fedoraproject.org Date: Tue Feb 21 17:15:21 2023 +0100
Use %gomodulesmode introduced in go-rpm-macros-3.0.10
There's no need to do a build just for this.
diff --git a/toolbox.spec b/toolbox.spec index d784a34..77d0e87 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -168,7 +168,7 @@ The %{name}-tests package contains system tests for %{name}.
%build -export GO111MODULE=off +export %{gomodulesmode} export GOPATH=%{gobuilddir}:%{gopath} export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ln -s src/cmd cmd
arch-excludes@lists.fedoraproject.org