From 1ad802e08e3802a703cfa4bde0c71ae489d95c20 Mon Sep 17 00:00:00 2001 From: Nicolas Mailhot Date: Feb 15 2018 17:52:58 +0000 Subject: read Go arch definition in the file that will be packaged --- diff --git a/go-compilers.spec b/go-compilers.spec index 643c2b9..01737fb 100644 --- a/go-compilers.spec +++ b/go-compilers.spec @@ -1,14 +1,21 @@ Name: go-compilers Version: 3 -Release: 0.14%{?dist} +Release: 0.15%{?dist} Summary: rpm automation to create Go language (golang) packages License: GPLv3+ -# This file contains Go architecture definitions which are also used here -# Therefore, changing those requires a double rebuild Source0: macros.go-srpm Source1: macros.go-rpm +# Read Go architecture definitions +%if 0%{?fedora} || 0%{?rhel} > 7 +%{?load:%{SOURCE0}} +%else +# This file contains Go architecture definitions which are also used here +# Therefore, changing those requires a double rebuild +BuildRequires: go-srpm-macros +%endif + # Autodeps Source10: go.attr Source11: go.prov @@ -126,7 +133,7 @@ install -m 0644 -vp %{SOURCE21} \ %endif %changelog -* Thu Feb 15 2018 Nicolas Mailhot - 3-0.14 +* Thu Feb 15 2018 Nicolas Mailhot - 3-0.15 - merge go-srpm-macros and go-compilers to reduce the number of Go rpm macro packages and make sure all the macros are kept in sync - simplify subpackage naming