From c514952dd3b38e19db712367f75359a84bead45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= <Bjorn@Rombobjörn.se>
Date: Thu, 26 Jun 2025 23:29:23 +0200
Subject: [PATCH] Evaluate _libexecdir at build time.

---
 gpgverify.spec   | 16 +++++++++++++---
 macros.gpgverify |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/gpgverify.spec b/gpgverify.spec
index 7e35234..38500dc 100644
--- a/gpgverify.spec
+++ b/gpgverify.spec
@@ -1,6 +1,6 @@
 Name:           gpgverify
-Version:        2.1
-Release:        3%{?dist}
+Version:        2.2
+Release:        1%{?dist}
 Summary:        Signature verifier for easy and safe scripting
 
 License:        Boehm-GC
@@ -24,10 +24,16 @@ vulnerable.
 %setup -c -T
 cp --preserve=timestamps %{sources} .
 
+%conf
+# Convey the location of the shellscript to macros.gpgverify. To keep build
+# dependencies minimal, just append a macro definition instead of editing the
+# file with something like Sed.
+echo '%%gpgverify_directory %{_libexecdir}' >>macros.gpgverify
+
 %install
 mkdir --parents %{buildroot}%{rpmmacrodir} %{buildroot}%{_libexecdir}
 cp --preserve=timestamps gpgverify %{buildroot}%{_libexecdir}/
-cp --preserve=timestamps macros.gpgverify %{buildroot}%{rpmmacrodir}/
+cp macros.gpgverify %{buildroot}%{rpmmacrodir}/
 
 %files
 %attr(0755,-,-) %{_libexecdir}/gpgverify
@@ -35,6 +41,10 @@ cp --preserve=timestamps macros.gpgverify %{buildroot}%{rpmmacrodir}/
 %license license.txt
 
 %changelog
+* Thu Jun 26 2025 Björn Persson <Bjorn@Rombobjörn.se> - 2.2-1
+- Evaluate _libexecdir at build time, not at run time (reported by Yaakov
+  Selkowitz).
+
 * Fri May 09 2025 Björn Persson <Bjorn@Rombobjörn.se> - 2.1-3
 - Rebuilt to retry the testsuite.
 
diff --git a/macros.gpgverify b/macros.gpgverify
index fac0992..d32b5d6 100644
--- a/macros.gpgverify
+++ b/macros.gpgverify
@@ -13,7 +13,7 @@
 
 # gpgverify verifies signed sources. There is documentation in the script.
 %gpgverify(k:s:d:) %{lua:
-local script = rpm.expand("%{_libexecdir}/gpgverify ")
+local script = rpm.expand("%{gpgverify_directory}/gpgverify ")
 local keyring = rpm.expand("%{-k*}")
 local signature = rpm.expand("%{-s*}")
 local data = rpm.expand("%{-d*}")
@@ -28,3 +28,4 @@ if data ~= "" then
   print(rpm.expand("--data='%{SOURCE" .. data ..  "}' "))
 end
 }
+# For simplicity, the location of the script is appended below at build time.