From c514952dd3b38e19db712367f75359a84bead45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Thu, 26 Jun 2025 23:29:23 +0200 Subject: [PATCH 1/4] 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 - 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 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. From 34fbd33fed5af31d49ced34cde47a109758317ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Fri, 27 Jun 2025 19:54:26 +0200 Subject: [PATCH 2/4] Evaluate _libexecdir at build time. --- gpgverify.spec | 18 ++++++++++++++---- macros.gpgverify => macros.gpgverify.in | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) rename macros.gpgverify => macros.gpgverify.in (94%) diff --git a/gpgverify.spec b/gpgverify.spec index 7e35234..5b8e26f 100644 --- a/gpgverify.spec +++ b/gpgverify.spec @@ -1,12 +1,12 @@ 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 URL: https://src.fedoraproject.org/rpms/gpgverify Source: gpgverify -Source: macros.gpgverify +Source: macros.gpgverify.in Source: license.txt BuildArch: noarch @@ -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,10 @@ cp --preserve=timestamps macros.gpgverify %{buildroot}%{rpmmacrodir}/ %license license.txt %changelog +* 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*}") From 54ea2c342c3caade7d5c547773c6b74ef5a695b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Tue, 15 Jul 2025 12:59:26 +0200 Subject: [PATCH 3/4] Adapted the dependencies because the gnupg2 package has been split. --- gpgverify.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gpgverify.spec b/gpgverify.spec index 5b8e26f..475e28a 100644 --- a/gpgverify.spec +++ b/gpgverify.spec @@ -1,6 +1,6 @@ Name: gpgverify Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Signature verifier for easy and safe scripting License: Boehm-GC @@ -10,7 +10,7 @@ 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 @@ -41,6 +41,9 @@ cp macros.gpgverify %{buildroot}%{rpmmacrodir}/ %license license.txt %changelog +* 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). From 296714a0a9113a38983ee490740b63c2b7b8d4a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:28:37 +0000 Subject: [PATCH 4/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- gpgverify.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gpgverify.spec b/gpgverify.spec index 475e28a..9a567a4 100644 --- a/gpgverify.spec +++ b/gpgverify.spec @@ -1,6 +1,6 @@ Name: gpgverify Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Signature verifier for easy and safe scripting License: Boehm-GC @@ -41,6 +41,9 @@ 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.