diff --git a/gpgverify.spec b/gpgverify.spec index 7e35234..9a567a4 100644 --- a/gpgverify.spec +++ b/gpgverify.spec @@ -1,16 +1,16 @@ Name: gpgverify -Version: 2.1 +Version: 2.2 Release: 3%{?dist} Summary: Signature verifier for easy and safe scripting License: Boehm-GC URL: https://src.fedoraproject.org/rpms/gpgverify Source: gpgverify -Source: macros.gpgverify +Source: macros.gpgverify.in Source: license.txt BuildArch: noarch -Requires: grep gnupg2 +Requires: grep gnupg2 gnupg2-verify %description GPGverify is a wrapper around GnuPG's gpgv. It verifies a file against an @@ -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, do substitution in Bash instead of something like Sed. +macrofile=$(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,16 @@ cp --preserve=timestamps 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 +- Evaluate _libexecdir at build time, not at run time (reported by Yaakov + Selkowitz). + * Fri May 09 2025 Björn Persson - 2.1-3 - Rebuilt to retry the testsuite. diff --git a/macros.gpgverify b/macros.gpgverify.in similarity index 94% rename from macros.gpgverify rename to macros.gpgverify.in index fac0992..20c78e0 100644 --- a/macros.gpgverify +++ b/macros.gpgverify.in @@ -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("@libexecdir@/gpgverify ") local keyring = rpm.expand("%{-k*}") local signature = rpm.expand("%{-s*}") local data = rpm.expand("%{-d*}")