From 38b84d33fd1c9b0aea62db93cbc31c676ece6559 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 09 2021 18:21:53 +0000 Subject: import emacs-26.1-7.el8 --- diff --git a/.emacs.metadata b/.emacs.metadata index 93c4eff..859630f 100644 --- a/.emacs.metadata +++ b/.emacs.metadata @@ -1 +1,2 @@ 53c01d987b2613701f42d9f941c2d5225a5874c4 SOURCES/emacs-26.1.tar.xz +c962aff1571d9fb346775ec4329877dbb63307d6 SOURCES/package-keyring.gpg diff --git a/.gitignore b/.gitignore index 106c563..3f46c5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SOURCES/emacs-26.1.tar.xz +SOURCES/package-keyring.gpg diff --git a/SPECS/emacs.spec b/SPECS/emacs.spec index 5ded526..9d844b8 100644 --- a/SPECS/emacs.spec +++ b/SPECS/emacs.spec @@ -5,7 +5,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 26.1 -Release: 5%{?dist} +Release: 7%{?dist} License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -19,6 +19,8 @@ Source6: emacs-terminal.desktop Source7: emacs-terminal.sh Source8: emacs.service Source9: %{name}.appdata.xml +# rhbz#1810729 +Source10: package-keyring.gpg # rhbz#713600 Patch1: emacs-spellchecker.patch Patch2: emacs-system-crypto-policies.patch @@ -181,6 +183,9 @@ autoconf # We prefer our emacs.desktop file cp %SOURCE1 etc/emacs.desktop +# GPG key for GNU ELPA packages backported from Emacs 26.3 (#1810729) +cp %SOURCE10 etc/package-keyring.gpg + grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \ && mv lisp/Makefile.in.new lisp/Makefile.in grep -v "pong.elc" lisp/Makefile.in > lisp/Makefile.in.new \ @@ -459,6 +464,12 @@ fi %dir %{_datadir}/emacs/site-lisp/site-start.d %changelog +* Thu Aug 5 2021 Jacek Migacz - 1:26.1-7 +- provide gating.yaml for CI + +* Mon Jul 19 2021 Jacek Migacz - 1:26.1-6 +- a new GPG key for GNU ELPA packages (#1810729) + * Mon Sep 10 2018 Jan Synáček - 1:26.1-5 - review annocheck distro flag failures (#1624109)