Pong and Tetris are excluded
Don’t mention removed games in menus or documentation. Resolves: RHEL-94297
This commit is contained in:
Jacek Migacz
parent
52776a966b
commit
0336f75e83
71
emacs-pong-and-tetris-are-excluded.patch
Normal file
71
emacs-pong-and-tetris-are-excluded.patch
Normal file
@ -0,0 +1,71 @@
|
||||
From 6f29ac0393bb0bb70c8122d9f1bda0ae5d8cee24 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Oliver <git@mavit.org.uk>
|
||||
Date: Thu, 26 Sep 2024 13:20:06 +0100
|
||||
Subject: [PATCH] Pong and Tetris are excluded.
|
||||
|
||||
---
|
||||
doc/emacs/ack.texi | 2 +-
|
||||
doc/emacs/misc.texi | 7 +------
|
||||
lisp/menu-bar.el | 6 ------
|
||||
test/src/doc-tests.el | 4 ++--
|
||||
4 files changed, 4 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
|
||||
index 5ec5cd53fa6..26f174831ca 100644
|
||||
--- a/doc/emacs/ack.texi
|
||||
+++ b/doc/emacs/ack.texi
|
||||
@@ -228,7 +228,7 @@ Acknowledgments
|
||||
|
||||
@item
|
||||
Glynn Clements provided @file{gamegrid.el} and a couple of games that
|
||||
-use it, Snake and Tetris.
|
||||
+use it, including Snake.
|
||||
|
||||
@item
|
||||
Andrew Cohen wrote @file{spam-wash.el}, to decode and clean email before
|
||||
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
|
||||
index 41e37fd094e..38e281bf59c 100644
|
||||
--- a/doc/emacs/misc.texi
|
||||
+++ b/doc/emacs/misc.texi
|
||||
@@ -3248,14 +3248,9 @@ Amusements
|
||||
nato-region} converts the text in the region to NATO phonetic
|
||||
alphabet; @kbd{M-x denato-region} converts it back.
|
||||
|
||||
-@findex pong
|
||||
-@cindex Pong game
|
||||
-@findex tetris
|
||||
-@cindex Tetris
|
||||
@findex snake
|
||||
@cindex Snake
|
||||
- @kbd{M-x pong}, @kbd{M-x snake} and @kbd{M-x tetris} are
|
||||
-implementations of the well-known Pong, Snake and Tetris games.
|
||||
+ @kbd{M-x snake} is an implementation of the well-known Snake game.
|
||||
|
||||
@findex solitaire
|
||||
@cindex solitaire
|
||||
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
|
||||
index bcfa83cf8e4..1b0a0bce6a5 100644
|
||||
--- a/lisp/menu-bar.el
|
||||
+++ b/lisp/menu-bar.el
|
||||
@@ -1658,18 +1658,12 @@ menu-bar-games-menu
|
||||
(bindings--define-key menu [zone]
|
||||
'(menu-item "Zone Out" zone
|
||||
:help "Play tricks with Emacs display when Emacs is idle"))
|
||||
- (bindings--define-key menu [tetris]
|
||||
- '(menu-item "Tetris" tetris
|
||||
- :help "Falling blocks game"))
|
||||
(bindings--define-key menu [solitaire]
|
||||
'(menu-item "Solitaire" solitaire
|
||||
:help "Get rid of all the stones"))
|
||||
(bindings--define-key menu [snake]
|
||||
'(menu-item "Snake" snake
|
||||
:help "Move snake around avoiding collisions"))
|
||||
- (bindings--define-key menu [pong]
|
||||
- '(menu-item "Pong" pong
|
||||
- :help "Bounce the ball to your opponent"))
|
||||
(bindings--define-key menu [mult]
|
||||
'(menu-item "Multiplication Puzzle" mpuz
|
||||
:help "Exercise brain with multiplication"))
|
||||
--
|
||||
2.46.1
|
||||
|
||||
21
emacs.spec
21
emacs.spec
@ -39,6 +39,9 @@ Patch12: emacs-latex-preview.patch
|
||||
Patch13: emacs-org-link-expand-abbrev-unsafe-elisp.patch
|
||||
Patch14: emacs-man-el-shell-injection-vulnerability.patch
|
||||
Patch15: emacs-CVE-2024-53920.patch
|
||||
# Avoid trademark issues
|
||||
Patch16: emacs-pong-and-tetris-are-excluded.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: atk-devel
|
||||
BuildRequires: cairo-devel
|
||||
@ -212,20 +215,17 @@ Development header files for Emacs.
|
||||
%patch -P 13 -p1 -b .org-link-expand-abbrev-unsafe-elisp
|
||||
%patch -P 14 -p1 -b .man-el-shell-injection-vulnerability
|
||||
%patch -P 15 -p1 -b .CVE-2024-53920
|
||||
%patch -P 16 -p1 -b .pong-and-tetris-are-excluded
|
||||
|
||||
# Avoid trademark issues
|
||||
rm lisp/play/pong.el lisp/play/pong.elc \
|
||||
lisp/play/tetris.el lisp/play/tetris.elc
|
||||
|
||||
autoconf
|
||||
|
||||
# We prefer our emacs.desktop file
|
||||
cp %SOURCE3 etc/emacs.desktop
|
||||
|
||||
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 \
|
||||
&& mv lisp/Makefile.in.new lisp/Makefile.in
|
||||
|
||||
# Avoid trademark issues
|
||||
rm -f lisp/play/tetris.el lisp/play/tetris.elc
|
||||
rm -f lisp/play/pong.el lisp/play/pong.el
|
||||
|
||||
# Sorted list of info files
|
||||
%define info_files ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq-w32 efaq eieio eintr elisp emacs-gnutls emacs-mime emacs epa erc ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
|
||||
|
||||
@ -502,6 +502,9 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
|
||||
%{_includedir}/emacs-module.h
|
||||
|
||||
%changelog
|
||||
* Tue Jun 18 2025 Jacek Migacz <jmigacz@redhat.com> - 1:27.2-17
|
||||
- Pong and Tetris are excluded (RHEL-94297)
|
||||
|
||||
* Fri May 09 2025 Jacek Migacz <jmigacz@redhat.com> - 1:27.2-16
|
||||
- Restore definition of variable "enable-dir-local-variables" (RHEL-92550)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user