| From fa9726ff69f86d6a87c4c4bd7e3d2881999a872a Mon Sep 17 00:00:00 2001 |
| From: Markus Lehtonen <markus.lehtonen@linux.intel.com> |
| Date: Thu, 23 Feb 2017 11:14:20 +0200 |
| Subject: [PATCH] macros: add %_gpg_sign_cmd_extra_args |
| |
| Similar to what rpm4 has. This macro can be used to customize the |
| gpg command line options when signing packages. This is needed for |
| gpg 2.1 which requires "--pinentry-mode loopback" to allow |
| non-interactive signing. |
| |
| Upstream-Status: Pending |
| |
| Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> |
| --- |
| macros/macros.in | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/macros/macros.in b/macros/macros.in |
| index 8bc5840..fda3c66 100644 |
| --- a/macros/macros.in |
| +++ b/macros/macros.in |
| @@ -524,7 +524,9 @@ $_arbitrary_tags_tests Foo:Bar |
| %_gpg_passphrase_way %{?_gpg_passphrase:--passphrase "%{_gpg_passphrase}"}%{!?_gpg_passphrase:--passphrase-fd 3} |
| |
| %__gpg_check_password_cmd %{__gpg} \ |
| - gpg --batch --no-verbose %{_gpg_passphrase_way} -u "%{_gpg_name}" -so - |
| + gpg --batch --no-verbose %{_gpg_passphrase_way} \ |
| + %{?_gpg_sign_cmd_extra_args:%{_gpg_sign_cmd_extra_args}} \ |
| + -u "%{_gpg_name}" -so - |
| #%__pgp_check_password_cmd %{__pgp} \ |
| # pgp +batchmode=on +verbose=0 "%{_pgp_name}" -sf |
| #%__pgp5_check_password_cmd %{__pgp} \ |
| @@ -532,6 +534,7 @@ $_arbitrary_tags_tests Foo:Bar |
| |
| %__gpg_sign_cmd %{__gpg} \ |
| gpg --batch --no-verbose --no-armor %{_gpg_passphrase_way} --no-secmem-warning \ |
| + %{?_gpg_sign_cmd_extra_args:%{_gpg_sign_cmd_extra_args}} \ |
| -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename} |
| #%__pgp_sign_cmd %{__pgp} \ |
| # pgp +batchmode=on +verbose=0 +armor=off \ |
| -- |
| 2.10.2 |
| |