From 7157b76d426e9983281aef574b41e81172f07569 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git@mavit.org.uk>
Date: Jul 10 2024 22:57:53 +0000
Subject: Fix another failing test.


---

diff --git a/0001-Fix-failing-help-fns-test.patch b/0001-Fix-failing-help-fns-test.patch
new file mode 100644
index 0000000..c24d7f5
--- /dev/null
+++ b/0001-Fix-failing-help-fns-test.patch
@@ -0,0 +1,30 @@
+From 75ca15f2a3146b17fde5e2a50ad9102c6108ba7f Mon Sep 17 00:00:00 2001
+From: Stefan Kangas <stefankangas@gmail.com>
+Date: Sun, 23 Jun 2024 20:54:22 +0200
+Subject: [PATCH] Fix failing help-fns-test
+
+* test/lisp/help-fns-tests.el (help-fns-test-lisp-defun):
+Fix failing test.
+---
+ test/lisp/help-fns-tests.el | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el
+index c3e8ca49723..fabf1959658 100644
+--- a/test/lisp/help-fns-tests.el
++++ b/test/lisp/help-fns-tests.el
+@@ -63,9 +63,8 @@ help-fns-test-lisp-macro
+     (should (string-match regexp result))))
+ 
+ (ert-deftest help-fns-test-lisp-defun ()
+-  (let ((regexp (if (featurep 'native-compile)
+-                    "a native-compiled Lisp function in .+subr\\.el"
+-                  "a byte-compiled Lisp function in .+subr\\.el"))
++  (let ((regexp (rx "a " (or "byte-compiled" "native-compiled")
++                    " Lisp function in " nonl "subr.el" nonl))
+         (result (help-fns-tests--describe-function 'last)))
+     (should (string-match regexp result))))
+ 
+-- 
+2.45.2
+
diff --git a/emacs.spec b/emacs.spec
index 3155fbd..b2138a1 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -36,8 +36,11 @@ Patch3:        emacs-libdir-vs-systemd.patch
 Patch4:        emacs-desktop.patch
 Patch5:        emacs-pgtk-on-x-error-message.patch
 
-# Skip failing tests:
+# Skip failing tests (patches taken from Emacs Git)
+Patch:         0001-Fix-failing-help-fns-test.patch
 Patch:         0001-Fix-flymake-tests-with-GCC-14.patch
+
+# Skip failing test (need to work out why this fails when building an RPM)
 Patch:         0001-Tag-process-tests-multiple-threads-waiting-unstable-.patch
 
 BuildRequires: alsa-lib-devel