rpms/emacs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix package tests for tetris no longer existing as a package

Browse Source 
Resolves: RHEL-94297
This commit is contained in:
Jacek Migacz 2025-06-23 11:27:35 +02:00
parent 928b886e42
commit 8c38ab479d
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
emacs-tests-for-tetris.patch Normal file
View File

@ -0,0 +1,40 @@
From 81969482e23b1c046354d9d860e548259f118b4e Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 28 Dec 2020 11:03:30 -0800
Subject: Fix package tests for tetris no longer existing as a package
* test/lisp/emacs-lisp/package-tests.el
(package-test-list-filter-by-name, package-test-list-clear-filter):
Use ansi-color instead of tetris, which no longer has a version:.
---
test/lisp/emacs-lisp/package-tests.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
index 23267545f83..92e593328c6 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -405,9 +405,9 @@ Must called from within a `tar-mode' buffer."
"Ensure package list is filtered correctly by package name."
(with-package-test ()
(let ((buf (package-list-packages)))
- (package-menu-filter-by-name "tetris")
+ (package-menu-filter-by-name "ansi-color")
(goto-char (point-min))
- (should (re-search-forward "^\\s-+tetris" nil t))
+ (should (re-search-forward "^\\s-+ansi-color" nil t))
(should (= (count-lines (point-min) (point-max)) 1))
(kill-buffer buf))))
@@ -463,7 +463,7 @@ Must called from within a `tar-mode' buffer."
(let ((buf (package-list-packages)))
(let ((num-packages (count-lines (point-min) (point-max))))
(should (> num-packages 1))
- (package-menu-filter-by-name "tetris")
+ (package-menu-filter-by-name "ansi-color")
(should (= (count-lines (point-min) (point-max)) 1))
(package-menu-clear-filter)
(should (= (count-lines (point-min) (point-max)) num-packages)))
--
cgit v1.2.3

3
emacs.spec
View File

@ -43,6 +43,7 @@ Patch15: emacs-CVE-2024-53920.patch
Patch16: emacs-pong-and-tetris-are-excluded.patch
Patch17: emacs-fix-flymake-tests-with-gcc-14.patch
Patch18: emacs-nsm-should-check.patch
Patch19: emacs-tests-for-tetris.patch
BuildRequires: gcc
BuildRequires: atk-devel
@ -220,6 +221,7 @@ Development header files for Emacs.
%patch -P 16 -p1 -b .pong-and-tetris-are-excluded
%patch -P 17 -p1 -b .fix-flymake-tests-with-gcc-14
%patch -P 18 -p1 -b .nsm-should-check
%patch -P 19 -p1 -b .tests-for-tetris
# Avoid trademark issues
rm lisp/play/pong.el lisp/play/pong.elc \
@ -508,6 +510,7 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
%changelog
* Mon Jun 23 2025 Jacek Migacz <jmigacz@redhat.com> - 1:27.2-18
- Fix nsm-should-check for "google.com" failure (RHEL-94297)
- Fix package tests for tetris no longer existing as a package (RHEL-94297)
* Wed Jun 18 2025 Jacek Migacz <jmigacz@redhat.com> - 1:27.2-17
- Pong and Tetris are excluded (RHEL-94297)