From 3870221a0bee267399c50da87836b224efd4d6b5 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Thu, 28 Apr 2022 10:00:02 +0300 Subject: [PATCH] Do not install macros for golang where gccgo must be used golang* files are alphabetically loaded later than gccgo* and overwrite values from them. --- go-rpm-macros.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec index c7f2f35..abc13d5 100644 --- a/go-rpm-macros.spec +++ b/go-rpm-macros.spec @@ -19,7 +19,7 @@ Version: 3.0.15 ExclusiveArch: %{golang_arches} %{gccgo_arches} Name: go-rpm-macros -Release: 1 +Release: 2 Summary: Build-stage rpm automation for Go packages Group: Development/Other @@ -106,7 +106,7 @@ install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 bin/* %{buildroot}%{_bindir} install -m 0755 -vd %{buildroot}%{_rpmmacrodir} -install -m 0644 -vp rpm/macros.d/macros.go-* \ +install -m 0644 -vp rpm/macros.d/macros.go-*rpm* \ %{buildroot}%{_rpmmacrodir} install -m 0755 -vd %{buildroot}%{_rpmluadir}/fedora/srpm install -m 0644 -vp rpm/lua/srpm/*lua \ @@ -121,17 +121,19 @@ install -m 0755 -vp rpm/*\.{prov,deps} \ %{buildroot}%{_rpmconfigdir}/ %ifarch %{golang_arches} -install -m 0644 -vp rpm/macros.d/macros.go-compilers-golang \ - %{buildroot}%{_rpmmacrodir}/macros.go-compiler-golang +# https://bugzilla.redhat.com/show_bug.cgi?id=2079705 +install -m 0644 -vp rpm/macros.d/macros.go-compilers-golang* \ + %{buildroot}%{_rpmmacrodir} %endif %ifarch %{gccgo_arches} install -m 0644 -vp rpm/macros.d/macros.go-compilers-gcc \ - %{buildroot}%{_rpmconfigdir}/macros.d/macros.go-compiler-gcc + %{buildroot}%{_rpmmacrodir} %endif %files -%doc LICENSE.txt README.md +%license LICENSE.txt +%doc README.md %{_bindir}/* %{_rpmconfigdir}/fileattrs/*.attr %{_rpmconfigdir}/*.prov -- 2.24.4