53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From 948c86d17904abf5d9d9c42c55ab78f6b970b972 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
|
|
Date: Tue, 5 Jul 2022 19:50:30 +0200
|
|
Subject: [PATCH] Add libexec to path for EPEL9 golist
|
|
|
|
---
|
|
bin/go-rpm-integration | 2 ++
|
|
rpm/gosymlink.deps | 2 ++
|
|
rpm/macros.d/macros.go-rpm | 3 ++-
|
|
3 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/bin/go-rpm-integration b/bin/go-rpm-integration
|
|
index 8a0f6b2..d460a61 100755
|
|
--- a/bin/go-rpm-integration
|
|
+++ b/bin/go-rpm-integration
|
|
@@ -17,6 +17,8 @@
|
|
#
|
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
+export PATH="${PATH}:/usr/libexec/go-rpm-macros"
|
|
+
|
|
usage() {
|
|
cat >&2 << EOF_USAGE
|
|
Usage: $0 <action> [ [-h] ]
|
|
diff --git a/rpm/gosymlink.deps b/rpm/gosymlink.deps
|
|
index d7f2866..a6d6538 100755
|
|
--- a/rpm/gosymlink.deps
|
|
+++ b/rpm/gosymlink.deps
|
|
@@ -16,6 +16,8 @@
|
|
#
|
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
+export PATH="${PATH}:/usr/libexec/go-rpm-macros"
|
|
+
|
|
usage() {
|
|
cat >&2 << EOF_USAGE
|
|
Usage: $0 <action> [ [-h] ]
|
|
diff --git a/rpm/macros.d/macros.go-rpm b/rpm/macros.d/macros.go-rpm
|
|
index f773f34..9cad4df 100644
|
|
--- a/rpm/macros.d/macros.go-rpm
|
|
+++ b/rpm/macros.d/macros.go-rpm
|
|
@@ -186,6 +186,7 @@ else
|
|
end
|
|
print(rpm.expand('GOPATH="%{?gobuilddir:%{gobuilddir}:}${GOPATH:+${GOPATH}:}%{?gopath}" ' ..
|
|
'GO111MODULE=off ' ..
|
|
+ 'PATH="${PATH}:%{_libexecdir}/go-rpm-macros" ' ..
|
|
"golist --imported " .. golistargs ..
|
|
" --template 'golang({{.}})\\\\n'" ..
|
|
" --with-tests --skip-self\\n"))
|
|
--
|
|
2.36.1
|
|
|