From afd13ccc5b9671ac95c710b10ba0970f758373b1e245a9b8946e6e736d5c343e Mon Sep 17 00:00:00 2001
From: Jeff Kowalczyk <jkowalczyk@suse.com>
Date: Tue, 15 Feb 2022 19:50:44 +0000
Subject: [PATCH] Accepting request 954732 from home:dimstar:Factory

- Move rpm macros from /etc/rpm to /usr/lib/rpm/macros.d
  (boo#1191383).

OBS-URL: https://build.opensuse.org/request/show/954732
OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/golang-packaging?expand=0&rev=74
---
 golang-packaging.changes |  6 ++++++
 golang-packaging.spec    | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/golang-packaging.changes b/golang-packaging.changes
index bffd776..fa68b28 100644
--- a/golang-packaging.changes
+++ b/golang-packaging.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 15 12:33:38 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Move rpm macros from /etc/rpm to /usr/lib/rpm/macros.d
+  (boo#1191383).
+
 -------------------------------------------------------------------
 Tue Feb 01 05:39:58 UTC 2022 - jkowalczyk@suse.com
 
diff --git a/golang-packaging.spec b/golang-packaging.spec
index 063843b..fdcccd3 100644
--- a/golang-packaging.spec
+++ b/golang-packaging.spec
@@ -40,30 +40,30 @@ A toolchain to help packaging golang, written in bash.
 %build
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir}/rpm/
-mkdir -p %{buildroot}%{_prefix}/lib/rpm/
+mkdir -p %{buildroot}%{_rpmmacrodir}
+mkdir -p %{buildroot}%{_rpmconfigdir}
 
-install -m0755 golang.prov %{buildroot}%{_prefix}/lib/rpm/
-install -m0755 golang.req %{buildroot}%{_prefix}/lib/rpm/
-install -m0755 golang.sh %{buildroot}%{_prefix}/lib/rpm/
-install -m0644 macros.go %{buildroot}%{_sysconfdir}/rpm/
+install -m0755 golang.prov %{buildroot}%{_rpmconfigdir}
+install -m0755 golang.req %{buildroot}%{_rpmconfigdir}
+install -m0755 golang.sh %{buildroot}%{_rpmconfigdir}
+install -m0644 macros.go %{buildroot}%{_rpmmacrodir}
 
 %if 0%{?suse_version} >= 1320
-mkdir -p %{buildroot}%{_prefix}/lib/rpm/fileattrs
-install -m0644 golang.attr %{buildroot}%{_prefix}/lib/rpm/fileattrs/
+mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs
+install -m0644 golang.attr %{buildroot}%{_rpmconfigdir}/fileattrs/
 %endif
 
 %files
 %defattr(-,root,root)
 %doc README.md CHANGELOG
 %license COPYING
-%{_prefix}/lib/rpm/golang.prov
-%{_prefix}/lib/rpm/golang.req
-%{_prefix}/lib/rpm/golang.sh
-%config %{_sysconfdir}/rpm/macros.go
+%{_rpmconfigdir}/golang.prov
+%{_rpmconfigdir}/golang.req
+%{_rpmconfigdir}/golang.sh
+%{_rpmmacrodir}/macros.go
 
 %if 0%{?suse_version} >= 1320
-%{_prefix}/lib/rpm/fileattrs/golang.attr
+%{_rpmconfigdir}/fileattrs/golang.attr
 %endif
 
 %changelog