From 8b2cbc54e02007c00087a5c52537dca053b94b65 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Mon, 8 Aug 2022 09:29:10 -0500 Subject: [PATCH] Stop installing duplicate go-compilers macros --- go-rpm-macros.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/go-rpm-macros.spec b/go-rpm-macros.spec index 9469b86..b498414 100644 --- a/go-rpm-macros.spec +++ b/go-rpm-macros.spec @@ -116,7 +116,7 @@ install -m 0644 -vp templates/rpm/*spec \ install -m 0755 -vd %{buildroot}%{_bindir} install -m 0755 bin/* %{buildroot}%{_bindir} -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/rpm install -m 0644 -vp rpm/lua/rpm/*lua \ @@ -132,13 +132,13 @@ install -m 0644 -vp rpm/macros.d/macros.go-srpm \ %endif %ifarch %{golang_arches} -install -m 0644 -vp rpm/macros.d/macros.go-compilers-golang \ - %{buildroot}%{_rpmconfigdir}/macros.d/macros.go-compiler-golang +install -m 0644 -vp rpm/macros.d/macros.go-compilers-golang{,-pie} \ + %{buildroot}%{_rpmconfigdir}/macros.d/ %endif %ifarch %{gccgo_arches} install -m 0644 -vp rpm/macros.d/macros.go-compilers-gcc \ - %{buildroot}%{_rpmconfigdir}/macros.d/macros.go-compiler-gcc + %{buildroot}%{_rpmconfigdir}/macros.d/ %endif %ifarch %{golang_arches} %{gccgo_arches}