From ee651ac2b0655def8a366270f44141b39a408178 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 28 Nov 2024 11:56:59 +0200 Subject: [PATCH] Support passing an alternative home to Sequoia signing too The macro name is stupid, %_sq_home would be better but to be consistent with the long standing %_gpg_path counterpart... --- docs/man/rpmsign.8.md | 4 ++++ macros.in | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/docs/man/rpmsign.8.md b/docs/man/rpmsign.8.md index aa8c306007..be4b16436b 100644 --- a/docs/man/rpmsign.8.md +++ b/docs/man/rpmsign.8.md @@ -153,6 +153,10 @@ Implementation specific macros: : Legacy macro for configuring user id with GnuPG. Use the implementation independent and non-ambiguous **%\_openpgp_sign_id** instead. +**%\_sq\_path** + +: The location of your Sequoia configuration if not the default. + For example, to configure rpm to sign with Sequoia PGP using a key with fingerprint of 7B36C3EE0CCE86EDBC3EFF2685B274E29F798E08 you would include diff --git a/macros.in b/macros.in index 8307283a8b..856c959c3d 100644 --- a/macros.in +++ b/macros.in @@ -337,6 +337,11 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ # #%_gpg_path /some/path +# Optional alternative path for Sequoia-sq configuration, same as +# passing --home to sq. +# +#%_sq_path /some/path + # The port and machine name of an HTTP proxy host (used for FTP/HTTP). # #%_httpport @@ -630,6 +635,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\ %__sq @__SQ@ %__sq_sign_cmd %{shescape:%{__sq}} \ %{__sq} sign \ + %{?_sq_path:--homedir %{shescape:%{_sq_path}}} \ %{?_openpgp_sign_id:--signer-key %{_openpgp_sign_id}} \ %{?_sq_sign_cmd_extra_args} \ --binary --detached --output %{shescape:%{?__signature_filename}} \