diff --git a/gpgverify.spec b/gpgverify.spec index 9a567a4..38500dc 100644 --- a/gpgverify.spec +++ b/gpgverify.spec @@ -1,16 +1,16 @@ Name: gpgverify Version: 2.2 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Signature verifier for easy and safe scripting License: Boehm-GC URL: https://src.fedoraproject.org/rpms/gpgverify Source: gpgverify -Source: macros.gpgverify.in +Source: macros.gpgverify Source: license.txt BuildArch: noarch -Requires: grep gnupg2 gnupg2-verify +Requires: grep gnupg2 %description GPGverify is a wrapper around GnuPG's gpgv. It verifies a file against an @@ -26,9 +26,9 @@ cp --preserve=timestamps %{sources} . %conf # Convey the location of the shellscript to macros.gpgverify. To keep build -# dependencies minimal, do substitution in Bash instead of something like Sed. -macrofile=$(macros.gpgverify +# 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} @@ -41,13 +41,7 @@ cp macros.gpgverify %{buildroot}%{rpmmacrodir}/ %license license.txt %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jul 15 2025 Björn Persson - 2.2-2 -- Adapted the dependencies because the gnupg2 package has been split. - -* Fri Jun 27 2025 Björn Persson - 2.2-1 +* Thu Jun 26 2025 Björn Persson - 2.2-1 - Evaluate _libexecdir at build time, not at run time (reported by Yaakov Selkowitz). diff --git a/macros.gpgverify.in b/macros.gpgverify similarity index 88% rename from macros.gpgverify.in rename to macros.gpgverify index 20c78e0..d32b5d6 100644 --- a/macros.gpgverify.in +++ 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.