Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Björn Persson
c514952dd3 Evaluate _libexecdir at build time. 2025-06-26 23:29:23 +02:00
2 changed files with 15 additions and 4 deletions

View file

@ -1,6 +1,6 @@
Name: gpgverify Name: gpgverify
Version: 2.1 Version: 2.2
Release: 3%{?dist} Release: 1%{?dist}
Summary: Signature verifier for easy and safe scripting Summary: Signature verifier for easy and safe scripting
License: Boehm-GC License: Boehm-GC
@ -24,10 +24,16 @@ vulnerable.
%setup -c -T %setup -c -T
cp --preserve=timestamps %{sources} . 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 %install
mkdir --parents %{buildroot}%{rpmmacrodir} %{buildroot}%{_libexecdir} mkdir --parents %{buildroot}%{rpmmacrodir} %{buildroot}%{_libexecdir}
cp --preserve=timestamps gpgverify %{buildroot}%{_libexecdir}/ cp --preserve=timestamps gpgverify %{buildroot}%{_libexecdir}/
cp --preserve=timestamps macros.gpgverify %{buildroot}%{rpmmacrodir}/ cp macros.gpgverify %{buildroot}%{rpmmacrodir}/
%files %files
%attr(0755,-,-) %{_libexecdir}/gpgverify %attr(0755,-,-) %{_libexecdir}/gpgverify
@ -35,6 +41,10 @@ cp --preserve=timestamps macros.gpgverify %{buildroot}%{rpmmacrodir}/
%license license.txt %license license.txt
%changelog %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 * Fri May 09 2025 Björn Persson <Bjorn@Rombobjörn.se> - 2.1-3
- Rebuilt to retry the testsuite. - Rebuilt to retry the testsuite.

View file

@ -13,7 +13,7 @@
# gpgverify verifies signed sources. There is documentation in the script. # gpgverify verifies signed sources. There is documentation in the script.
%gpgverify(k:s:d:) %{lua: %gpgverify(k:s:d:) %{lua:
local script = rpm.expand("%{_libexecdir}/gpgverify ") local script = rpm.expand("%{gpgverify_directory}/gpgverify ")
local keyring = rpm.expand("%{-k*}") local keyring = rpm.expand("%{-k*}")
local signature = rpm.expand("%{-s*}") local signature = rpm.expand("%{-s*}")
local data = rpm.expand("%{-d*}") local data = rpm.expand("%{-d*}")
@ -28,3 +28,4 @@ if data ~= "" then
print(rpm.expand("--data='%{SOURCE" .. data .. "}' ")) print(rpm.expand("--data='%{SOURCE" .. data .. "}' "))
end end
} }
# For simplicity, the location of the script is appended below at build time.