On Tue, Oct 29, 2013 at 5:55 PM, Gary V. Vaughan <g...@gnu.org> wrote:
> On Oct 30, 2013, at 10:13 AM, Jim Meyering <j...@meyering.net> wrote:
>> On Tue, Oct 29, 2013 at 1:21 PM, Gary V. Vaughan <g...@gnu.org> wrote:
>>> for now the new tag and fallback to --short-log fixes all
>>> the immediate problems I was having (except the reliance on gnupg-1.4
>>> gpgv).
>>
>> You say that as if there were a problem with the maint.mk rule.
>> The rule relies on the existence of a program named "gpgv". If your
>> distribution or packaging tool chooses to call that binary gpgv2,
>
> Well, gnupg-2.0.22 itself chooses to call that binary gpgv2, which is
> why I reported it, because I imagine many other maintainers use a distro
> that ships gnupg-2.x rather that gnupg-1.4.x by default.
Oh, I didn't realize that, and should have checked. Thanks.
Here's an untested patch that should resolve the problem:
From cfdda19a2d065bcc0b164018d03c39bf3859d285 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyer...@fb.com>
Date: Tue, 29 Oct 2013 22:01:44 -0700
Subject: [PATCH] maint.mk: prefer gpgv2 over gpgv
* top/maint.mk (gpgv): Use gpgv2 if present, else gpgv.
(gpg_key_ID): Use $(gpgv), rather than hard-coding "gpgv".
Reported by Gary Vaughan.
---
ChangeLog | 7 +++++++
top/maint.mk | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 0c564db..d1b8505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-29 Jim Meyering <meyer...@fb.com>
+
+ maint.mk: prefer gpgv2 over gpgv
+ * top/maint.mk (gpgv): Use gpgv2 if present, else gpgv.
+ (gpg_key_ID): Use $(gpgv), rather than hard-coding "gpgv".
+ Reported by Gary Vaughan.
+
2013-10-28 Jim Meyering <meyer...@fb.com>
gnulib-tool: protect against CDPATH
diff --git a/top/maint.mk b/top/maint.mk
index 8cb58f8..9c02ed4 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1287,12 +1287,13 @@ gnulib-version = $$(cd $(gnulib_dir)
\
&& { git describe || git rev-parse --short=10 HEAD; } )
bootstrap-tools ?= autoconf,automake,gnulib
+gpgv = $$(gpgv2 --version >/dev/null && echo gpgv2 || echo gpgv)
# If it's not already specified, derive the GPG key ID from
# the signed tag we've just applied to mark this release.
gpg_key_ID ?= \
$$(cd $(srcdir) \
&& git cat-file tag v$(VERSION) \
- | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
+ | $(gpgv) --status-fd 1 --keyring /dev/null - - 2>/dev/null \
| awk '/^\[GNUPG:\] ERRSIG / {print $$3; exit}')
translation_project_ ?= coordina...@translationproject.org
--
1.8.4.1.559.gdb9bdfb
