diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | top/maint.mk | 9 |
2 files changed, 15 insertions, 0 deletions
@@ -9,6 +9,12 @@ (main): Don't suggest 'gpg --keyserver' since the situation with public key servers is complicated and GnuPG version dependent. + maintainer-makefile: Improve GnuPG announce-gen options. + * top/maint.mk (gpg_key_emil): New variable. + (gpg_keyring_url): New variable. + (announcement): Pass them as --gpg-key-email and + --gpg-keyring-url. + 2022-03-13 Ben Pfaff <blp@cs.stanford.edu> Document Automake 1.14 requirement in NEWS, too, since it had been diff --git a/top/maint.mk b/top/maint.mk index 92cef425cf..b9f483bf97 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1391,6 +1391,11 @@ gpg_key_ID ?= \ && git cat-file tag v$(VERSION) \ | $(gpgv) --status-fd 1 --keyring /dev/null - - 2>/dev/null \ | $(AWK) '/^\[GNUPG:\] ERRSIG / {print $$3; exit}') +gpg_key_email ?= \ + $$(gpg --list-key --with-colons $(gpg_key_ID) 2>/dev/null \ + | $(AWK) -F: '/^uid/ {print $$10; exit}' \ + | $(SED) -n 's/.*<\(.*\)>/\1/p') +gpg_keyring_url ?= https://savannah.gnu.org/project/release-gpgkeys.php?group=$(PACKAGE)&download=1 translation_project_ ?= coordinator@translationproject.org @@ -1421,6 +1426,10 @@ announcement: NEWS ChangeLog $(rel-files) --prev=$(PREV_VERSION) \ --curr=$(VERSION) \ --gpg-key-id=$(gpg_key_ID) \ + $$(test -n "$(gpg_key_email)" && \ + echo --gpg-key-email="$(gpg_key_email)") \ + $$(test -n "$(gpg_keyring_url)" && \ + echo --gpg-keyring-url="$(gpg_keyring_url)") \ --srcdir=$(srcdir) \ --news=$(srcdir)/NEWS \ --bootstrap-tools=$(bootstrap-tools) \ |