From 4d837b78e66b9b74c5a5454ccbbd407c9e879405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Tue, 1 Dec 2020 11:17:09 +0100 Subject: [PATCH] Drop 32bit arches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on an upstream PR that is taking too long to merge, considering the broken buildroot. Will be overwritten by the sync. Hopefully with the fix. https://src.fedoraproject.org/rpms/go-rpm-macros/pull-request/3 Signed-off-by: Petr Šabata --- go-rpm-macros.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec index 970e920..00acdab 100644 --- a/go-rpm-macros.spec +++ b/go-rpm-macros.spec @@ -8,6 +8,9 @@ Version: 3.0.9 # Master definition that will be written to macro files %global golang_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x +%if 0%{?rhel} >= 9 +%global golang_arches x86_64 aarch64 ppc64le s390x +%endif %global gccgo_arches %{mips} # Go sources can contain arch-specific files and our macros will package the # correct files for each architecture. Therefore, move gopath to _libdir and @@ -17,7 +20,7 @@ Version: 3.0.9 ExclusiveArch: %{golang_arches} %{gccgo_arches} Name: go-rpm-macros -Release: 1%{?dist} +Release: 1.1%{?dist} Summary: Build-stage rpm automation for Go packages License: GPLv3+ @@ -162,6 +165,10 @@ install -m 0644 -vp rpm/macros.d/macros.go-compilers-gcc \ %{_spectemplatedir}/*.spec %changelog +* Tue Dec 01 2020 Petr Šabata - 3.0.9-1.1 +- Drop 32bit arches in EL 9 +- Downstream only until uprstream PR#3 gets merged + * Thu Aug 13 2020 Neal Gompa - 3.0.9-1 - Update to 3.0.9