diff --git a/.gitignore b/.gitignore
index 1d9aa7a..3aa373c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
+/bodhi.template.last
+/emacs-*.src.rpm
 /emacs-23.3a.tar.bz2
-/php-mode.el
 /emacs-24.0.92.tar.gz
 /emacs-24.0.93.tar.gz
 /emacs-24.0.94.tar.gz
@@ -37,3 +38,13 @@
 /emacs-29.1.tar.xz.sig
 /emacs-29.3.tar.xz
 /emacs-29.3.tar.xz.sig
+/emacs-29.4.tar.xz
+/emacs-29.4.tar.xz.sig
+/emacs-30.0.91.tar.xz
+/emacs-30.0.91.tar.xz.sig
+/php-mode.el
+/results_emacs/
+/emacs-30.1.tar.xz
+/emacs-30.1.tar.xz.sig
+/emacs-30.2.tar.xz
+/emacs-30.2.tar.xz.sig
diff --git a/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch b/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch
new file mode 100644
index 0000000..09f2ed7
--- /dev/null
+++ b/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch
@@ -0,0 +1,31 @@
+From 164e45695f9784469ff2f66cafcd6bc927c246be Mon Sep 17 00:00:00 2001
+From: Peter Oliver <git@mavit.org.uk>
+Date: Tue, 18 Mar 2025 13:16:15 +0000
+Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20specify=20StartupWMClass=20in?=
+ =?UTF-8?q?=20emacs.desktop?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See the explanation at
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=49505#67.  In summary, the
+value we were providing doesn’t work on Wayland, and the default should
+be fine.
+
+* etc/emacs.desktop: Don’t specify StartupWMClass
+---
+ etc/emacs.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/etc/emacs.desktop b/etc/emacs.desktop
+index 0d7cac14da5..16ad3c7eb48 100644
+--- a/etc/emacs.desktop
++++ b/etc/emacs.desktop
+@@ -9,4 +9,3 @@ Type=Application
+ Terminal=false
+ Categories=Development;TextEditor;
+ StartupNotify=true
+-StartupWMClass=Emacs
+-- 
+2.48.1
+
diff --git a/0001-Pong-and-Tetris-are-excluded.patch b/0001-Pong-and-Tetris-are-excluded.patch
new file mode 100644
index 0000000..989764a
--- /dev/null
+++ b/0001-Pong-and-Tetris-are-excluded.patch
@@ -0,0 +1,86 @@
+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"))
+diff --git a/test/src/doc-tests.el b/test/src/doc-tests.el
+index b41a7ac5fb6..24befb737bc 100644
+--- a/test/src/doc-tests.el
++++ b/test/src/doc-tests.el
+@@ -34,8 +34,8 @@ doc-tests-documentation/autoloaded-macro
+ 
+ (ert-deftest doc-tests-documentation/autoloaded-defun ()
+   (skip-unless noninteractive)
+-  (should (autoloadp (symbol-function 'tetris)))
+-  (should (stringp (documentation 'tetris)))) ; See Bug#52969.
++  (should (autoloadp (symbol-function 'doctor)))
++  (should (stringp (documentation 'doctor)))) ; See Bug#52969.
+ 
+ (ert-deftest doc-tests-quoting-style ()
+   (should (memq (text-quoting-style) '(grave straight curve))))
+-- 
+2.46.1
+
diff --git a/0001-Support-Tree-sitter-version-0.26-and-later.patch b/0001-Support-Tree-sitter-version-0.26-and-later.patch
new file mode 100644
index 0000000..936ca2e
--- /dev/null
+++ b/0001-Support-Tree-sitter-version-0.26-and-later.patch
@@ -0,0 +1,106 @@
+From 16f0be6354ea13331859c861fa7d423a0b54bec7 Mon Sep 17 00:00:00 2001
+From: Eli Zaretskii <eliz@gnu.org>
+Date: Fri, 17 Oct 2025 14:15:41 +0300
+Subject: [PATCH] Support Tree-sitter version 0.26 and later
+
+* src/treesit.c (init_treesit_functions)
+[TREE_SITTER_LANGUAGE_VERSION >= 15]: Define prototype for, and
+load 'ts_language_abi_version' instead of the deprecated (and
+removed in tree-sitter 0.26) 'ts_language_version'.
+(ts_language_abi_version) [TREE_SITTER_LANGUAGE_VERSION >= 15]:
+Define on WINDOWSNT, instead of 'ts_language_version'.
+(treesit_language_abi_version): New compatibility function.
+(treesit_load_language, Ftreesit_language_abi_version): Use
+'treesit_language_abi_version' instead of 'ts_language_version'.
+(Bug#79627)
+---
+ src/treesit.c | 34 +++++++++++++++++++++++++++++++++-
+ 1 file changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/src/treesit.c b/src/treesit.c
+index e2986c186b8..4d6bf9a5dbd 100644
+--- a/src/treesit.c
++++ b/src/treesit.c
+@@ -34,7 +34,11 @@ Copyright (C) 2021-2025 Free Software Foundation, Inc.
+ # include "w32common.h"
+ 
+ /* In alphabetical order.  */
++#if TREE_SITTER_LANGUAGE_VERSION >= 15
++#undef ts_language_abi_version
++#else
+ #undef ts_language_version
++#endif
+ #undef ts_node_child
+ #undef ts_node_child_by_field_name
+ #undef ts_node_child_count
+@@ -89,7 +93,11 @@ Copyright (C) 2021-2025 Free Software Foundation, Inc.
+ #undef ts_tree_get_changed_ranges
+ #undef ts_tree_root_node
+ 
++#if TREE_SITTER_LANGUAGE_VERSION >= 15
++DEF_DLL_FN (uint32_t, ts_language_abi_version, (const TSLanguage *));
++#else
+ DEF_DLL_FN (uint32_t, ts_language_version, (const TSLanguage *));
++#endif
+ DEF_DLL_FN (TSNode, ts_node_child, (TSNode, uint32_t));
+ DEF_DLL_FN (TSNode, ts_node_child_by_field_name,
+ 	    (TSNode, const char *, uint32_t));
+@@ -166,7 +174,11 @@ init_treesit_functions (void)
+   if (!library)
+     return false;
+ 
++#if TREE_SITTER_LANGUAGE_VERSION >= 15
++  LOAD_DLL_FN (library, ts_language_abi_version);
++#else
+   LOAD_DLL_FN (library, ts_language_version);
++#endif
+   LOAD_DLL_FN (library, ts_node_child);
+   LOAD_DLL_FN (library, ts_node_child_by_field_name);
+   LOAD_DLL_FN (library, ts_node_child_count);
+@@ -224,7 +236,11 @@ init_treesit_functions (void)
+   return true;
+ }
+ 
++#if TREE_SITTER_LANGUAGE_VERSION >= 15
++#define ts_language_abi_version fn_ts_language_abi_version
++#else
+ #define ts_language_version fn_ts_language_version
++#endif
+ #define ts_node_child fn_ts_node_child
+ #define ts_node_child_by_field_name fn_ts_node_child_by_field_name
+ #define ts_node_child_count fn_ts_node_child_count
+@@ -632,6 +648,22 @@ treesit_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
+     }
+ }
+ 
++/* This function is a compatibility shim.  Tree-sitter 0.25 introduced
++   ts_language_abi_version as a replacement for ts_language_version, and
++   tree-sitter 0.26 removed ts_language_version.  Here we use the fact
++   that 0.25 bumped TREE_SITTER_LANGUAGE_VERSION to 15, to use the new
++   function instead of the old one, when Emacs is compiled against
++   tree-sitter version 0.25 or newer.  */
++static uint32_t
++treesit_language_abi_version (const TSLanguage *ts_lang)
++{
++#if TREE_SITTER_LANGUAGE_VERSION >= 15
++  return ts_language_abi_version (ts_lang);
++#else
++  return ts_language_version (ts_lang);
++#endif
++}
++
+ /* Load the dynamic library of LANGUAGE_SYMBOL and return the pointer
+    to the language definition.
+ 
+@@ -817,7 +849,7 @@ DEFUN ("treesit-language-abi-version", Ftreesit_language_abi_version,
+ 						       &signal_data);
+       if (ts_language == NULL)
+ 	return Qnil;
+-      uint32_t version =  ts_language_version (ts_language);
++      uint32_t version =  treesit_language_abi_version (ts_language);
+       return make_fixnum((ptrdiff_t) version);
+     }
+ }
+-- 
+2.52.0
+
diff --git a/0002-Fall-back-to-the-terminal-from-pure-GTK-when-no-disp.patch b/0002-Fall-back-to-the-terminal-from-pure-GTK-when-no-disp.patch
new file mode 100644
index 0000000..dbcf3d9
--- /dev/null
+++ b/0002-Fall-back-to-the-terminal-from-pure-GTK-when-no-disp.patch
@@ -0,0 +1,63 @@
+From 7099578f18b1ea6a168b1883fa7a4ac7f49fc08f Mon Sep 17 00:00:00 2001
+From: Peter Oliver <git@mavit.org.uk>
+Date: Sun, 14 Jul 2024 20:47:14 +0100
+Subject: [PATCH 2/2] Fall back to the terminal from pure GTK when no display
+ is available
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* src/dispnew.c (init_display_interactive): Only use PGTK windowing if
+at least one of the environment variables WAYLAND_DISPLAY, DISPLAY,
+BROADWAY_DISPLAY is set.  (Bug#63555)
+
+This patch is not suitable for merging, because it doesn’t consider
+what happens if you try to use PGTK on Windows or MacOS.
+---
+ src/dispnew.c | 29 ++++++++++++++++++++++++++---
+ 1 file changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/src/dispnew.c b/src/dispnew.c
+index 7cf2b49273c..481d33a7302 100644
+--- a/src/dispnew.c
++++ b/src/dispnew.c
+@@ -6557,10 +6557,33 @@ init_display_interactive (void)
+ #endif
+ 
+ #ifdef HAVE_PGTK
+-  if (!inhibit_window_system && !will_dump_p ())
++  if (!inhibit_window_system)
+     {
+-      Vinitial_window_system = Qpgtk;
+-      return;
++      if (!display_arg && !will_dump_p ())
++	{
++	  int i;
++	  const char *gdk_display_variables[] = {
++	    "WAYLAND_DISPLAY",
++	    "DISPLAY",
++	    "BROADWAY_DISPLAY",
++	  };
++	  size_t n = ARRAYELTS (gdk_display_variables);
++
++	  for (i = 0; i < n; i++)
++	    {
++	      char *display;
++	      display = getenv (gdk_display_variables[i]);
++	      if (display != 0 && *display != 0)
++		{
++		  display_arg = 1;
++		  break;
++		}
++	    }
++	}
++      if (display_arg) {
++	Vinitial_window_system = Qpgtk;
++	return;
++      }
+     }
+ #endif
+ 
+-- 
+2.45.2
+
diff --git a/12BB9B400EE3F77282864D18272B5C54E015416A b/12BB9B400EE3F77282864D18272B5C54E015416A
new file mode 100644
index 0000000..47fb297
--- /dev/null
+++ b/12BB9B400EE3F77282864D18272B5C54E015416A
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: 12BB 9B40 0EE3 F772 8286  4D18 272B 5C54 E015 416A
+Comment: Andrea Corallo <acorallo@gnu.org>
+
+xsFNBGa/sd8BEAC7hQAGte6YvxDaiTutpSkVrb+zJBGcEW/AroE/dduBn8mfxa/Y
+i71C2GV/y03aibdaO+cXPULAkkuJVDnFk57hn3w9zo98LzqDSEgNFcAUSSSQdyj7
+Wn3J26doRpFQKnv3dbx1yZRZccbLgt/AH6hzhvNjFbYZ53LYE9rKzUYLTNHDhUI4
+QTda2PvgWoySXcjBKhyIgg9zZLSc2w4ZwhO9WDVai58xNsl+YyU2HqVPpJZSCX0j
+liIooHOEL2D601ByrWmePRGFR0tD6V9xj5jWuusErb78r57NOPsRCRKCKcg/v/kl
+fA5+byvanw27PDa8zoheXgF41uDf96keOQPBve3TE1Oy4x+G55zuP9KNQ5aSCG49
+x0Cc7BET23JmiWUnz1GUbM7vka5ell+smmq+kTDtK47L+4N954a6CR0esPLJMLF6
+Ub2y8SY2XPn1Bv8lsN77f0L5yyhnK72H+mf4fS/qjJlN0F+DWx49Z8it9rbG8Atc
+X6Vqzv5qaDPbCpAqdqs2qrv3nAdvYOlwxmVh6Hxq1EOFT2v49dmn3viVBNnuT7yW
+tyvpTDyvfLKOnfH+OLLuqPUFZnxt8mU8ieNEnvIYojSOFyddJAh2uOI3sqjLHrDg
+PRAYFv9jp7K7pk+S054mdF31qD+TTxjWQtNI8Sxh/Q71Vtz7JyqYWd/JCQARAQAB
+zSFBbmRyZWEgQ29yYWxsbyA8YWNvcmFsbG9AZ251Lm9yZz7CwZQEEwEKAD4WIQQS
+u5tADuP3coKGTRgnK1xU4BVBagUCZr+x3wIbAwUJA8JnAAULCQgHAgYVCgkICwIE
+FgIDAQIeAQIXgAAKCRAnK1xU4BVBaj/0D/4ogwPjg6Cwyi8pmRYx9gOjQNIRtjOb
+2aHFYQs9luFy20Wlt/7QtelDH+NLCAb5PKvhDI3Sw+SIoheAndhbzqW7GEW5J9G7
+10PPkCUCjbicJOKsUkMv03wS6IrelUYzgjbmGYRo2vYcSb+BHXQR4MuxDSL/2vPD
+LHYKwij9K+FozgJVfjq5n97l/wsGsc/orRiST23ykiXyCZweulGLhXnoCghHrnB1
+B+xBaCv3P1GW/BZZgXGPQ+1XMOsFlP951vfjirlHnJMvMDkMkNhT6Qh282jTokWN
+TVQqKUv5tpdNkId+QmUhzC+DcfoOsegB3wWa6VQ/w1cG9mkoPUTT8Y8fo4FXnWwV
+U4472JuZdQYFDAKEnTsW1TRNgBb5xLNNCUmDUVDndgn1WtZIZx18QBtJ1CHhycaN
+C68McWuvvENhEM8clUXIHundgeDce4gcQC23Un7NT0PbNTwvGPfBSaoVax5ZVHuZ
+Tr2pTHqAqqi4YLnrE5R06OIWQzVOVs5NZplDPZGXZOxryXa3ssLxjL2VYbo4AAUZ
+h3fyVOzNHlGLT3Egj4XHDuDFcswUimD5SmrqQQwg94CgXExDisqH9Uo8L7Zxf/AG
+UpIsxpDv219GOdTffbzl01W6oaP4obiTwMFUaQ7ljdCfq19KYdo576touTU+/48q
+7AjjL28Eznhz0Q==
+=goOm
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/CEA1DE21AB108493CC9C65742E82323B8F4353EE b/CEA1DE21AB108493CC9C65742E82323B8F4353EE
new file mode 100644
index 0000000..9007a2c
--- /dev/null
+++ b/CEA1DE21AB108493CC9C65742E82323B8F4353EE
@@ -0,0 +1,337 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: CEA1 DE21 AB10 8493 CC9C  6574 2E82 323B 8F43 53EE
+Comment: Stefan Kangas <skangas@skangas.se>
+Comment: Stefan Kangas <stefan@marxist.se>
+Comment: Stefan Kangas <stefankangas@gmail.com>
+
+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
+ZOTZGRs=
+=fO4L
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/default.el b/default.el
index 7df4cee..7ec900f 100644
--- a/default.el
+++ b/default.el
@@ -1,7 +1,13 @@
-;;; default.el - loaded after ".emacs" on startup
-;;;
-;;; Setting `inhibit-default-init' non-nil in "~/.emacs"
-;;; prevents loading of this file.  Also the "-q" option to emacs
-;;; prevents both "~/.emacs" and this file from being loaded at startup.
+;;; default.el --- loaded after ".emacs" on startup -*- lexical-binding: t -*-
+
+;;; Commentary:
+;;
+;; Setting `inhibit-default-init' non-nil in "~/.emacs"
+;; prevents loading of this file.  Also the "-q" option to "emacs"
+;; prevents both "~/.emacs" and this file from being loaded at startup.
+
+;;; Code:
 
 (setq-default smime-CA-directory "/etc/ssl/certs")
+
+;;; default.el ends here
diff --git a/dotemacs.el b/dotemacs.el
index e1bee17..f7ddcf9 100644
--- a/dotemacs.el
+++ b/dotemacs.el
@@ -1,4 +1,4 @@
-;; .emacs
+;;; -*- lexical-binding: t -*-
 
 (custom-set-variables
  ;; uncomment to always end a file with a newline
diff --git a/emacs-desktop.patch b/emacs-desktop.patch
deleted file mode 100644
index 2453407..0000000
--- a/emacs-desktop.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 90e902854c53c6ab5ef8711af27f42fbc77d9ffe Mon Sep 17 00:00:00 2001
-From: Peter Oliver <git@mavit.org.uk>
-Date: Mon, 10 Apr 2023 20:55:54 +0100
-Subject: [PATCH] Use a wrapper to avoid the pure GTK build on X11, where it is
- unsupported.
-
----
- etc/emacs.desktop | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/etc/emacs.desktop b/etc/emacs.desktop
-index 0d7cac14da5..eabc78bb884 100644
---- a/etc/emacs.desktop
-+++ b/etc/emacs.desktop
-@@ -3,7 +3,7 @@ Name=Emacs
- GenericName=Text Editor
- Comment=Edit text
- MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
--Exec=emacs %F
-+Exec=emacs-desktop %F
- Icon=emacs
- Type=Application
- Terminal=false
--- 
-2.39.2
-
diff --git a/emacs-desktop.sh b/emacs-desktop.sh
index a94c100..2f60d9d 100755
--- a/emacs-desktop.sh
+++ b/emacs-desktop.sh
@@ -1,19 +1,41 @@
-#!/bin/sh
+#!/usr/bin/bash
 
 # The pure GTK build of emacs is not supported on X11, so try to avoid
-# using if there is an alternative.
+# using it there if there is another alternative.
 
-if [ "$XDG_SESSION_TYPE" = 'x11' ]; then
-    emacs="$(readlink -f /usr/bin/emacs)"
-    emacs="${emacs##*/}"
-    emacs="${emacs%-*.*}"
-    if [ "$emacs" = 'emacs' ]; then
-        if type emacs-gtk+x11 >/dev/null; then
-            exec emacs-gtk+x11 "$@"
-        elif type emacs-lucid >/dev/null; then
-            exec emacs-lucid "$@"
-        fi
-    fi
+preferred="$(readlink -f /usr/bin/emacs)"
+
+if [[ $XDG_SESSION_TYPE == 'x11' ]]; then
+    case "$preferred" in
+    *-pgtk)
+        for variant in gtk+x11 lucid; do
+            if type "emacs-$variant" >/dev/null; then
+                exec -a emacs "emacs-$variant" "$@"
+            fi
+        done
+        ;;
+    */emacs-desktop)
+        # If this wrapper script is itself the preferred alternative,
+        # select something suitable from the options available.
+        for variant in gtk+x11 lucid pgtk nw; do
+            if type "emacs-$variant" >/dev/null; then
+                exec -a emacs "emacs-$variant" "$@"
+            fi
+        done
+        exit 2
+        ;;
+    esac
+else
+    case "$preferred" in
+    */emacs-desktop)
+        for variant in pgtk gtk+x11 lucid nw; do
+            if type "emacs-$variant" >/dev/null; then
+                exec -a emacs "emacs-$variant" "$@"
+            fi
+        done
+        exit 2
+        ;;
+    esac
 fi
 
 exec emacs "$@"
diff --git a/emacs-pgtk-on-x-error-message.patch b/emacs-pgtk-on-x-error-message.patch
index cfc7c3d..b49abee 100644
--- a/emacs-pgtk-on-x-error-message.patch
+++ b/emacs-pgtk-on-x-error-message.patch
@@ -12,12 +12,12 @@ index c00e13550bd..ce51bff5947 100644
 --- a/src/pgtkterm.c
 +++ b/src/pgtkterm.c
 @@ -6680,7 +6680,8 @@ pgtk_display_x_warning (GdkDisplay *display)
- 			  " System.  That configuration is unsupported and"
- 			  " will lead to sporadic crashes during transfer of"
- 			  " large selection data.  It will also lead to"
--			  " various problems with keyboard input.");
-+			  " various problems with keyboard input."
-+			  "\nInstall emacs-gtk+x11 or emacs-lucid package.");
+ 			  " System.  That configuration is unsupported and\n"
+ 			  " will lead to sporadic crashes during transfer of\n"
+ 			  " large selection data.  It will also lead to\n"
+-			  " various problems with keyboard input.\n");
++			  " various problems with keyboard input.\n"
++			  "\nInstall emacs-gtk+x11 or emacs-lucid package.\n");
    gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
    gtk_container_add (GTK_CONTAINER (content_area), label);
    gtk_widget_show (label);
diff --git a/emacs-system-crypto-policies.patch b/emacs-system-crypto-policies.patch
index 2f2435c..f9321ce 100644
--- a/emacs-system-crypto-policies.patch
+++ b/emacs-system-crypto-policies.patch
@@ -1,11 +1,12 @@
 --- a/src/gnutls.c     2016-01-24 10:29:58.000000000 +0100
 +++ b/src/gnutls.c     2016-02-02 09:32:28.477274274 +0100
-@@ -1557,7 +1557,7 @@
+@@ -1557,8 +1557,8 @@
    gnutls_certificate_credentials_t x509_cred = NULL;
    gnutls_anon_client_credentials_t anon_cred = NULL;
    Lisp_Object global_init;
 -  char const *priority_string_ptr = "NORMAL"; /* default priority string.  */
 +  char const *priority_string_ptr = "@SYSTEM"; /* default priority string.  */
    char *c_hostname;
+   const char *c_pass;
  
    /* Placeholders for the property list elements.  */
diff --git a/emacs.spec b/emacs.spec
index f0a6f55..e10f642 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,95 +1,124 @@
-%global _hardened_build 1
+# This file is encoded in UTF-8.  -*- coding: utf-8 -*-
 
 %bcond gpm %[!(0%{?rhel} >= 10)]
-%bcond webkit %[!(0%{?rhel} >= 10)]
+%bcond_without gtkx11
+%bcond_without lucid
+%bcond_without nw
 
-# This file is encoded in UTF-8.  -*- coding: utf-8 -*-
 Summary:       GNU Emacs text editor
 Name:          emacs
 Epoch:         1
-Version:       29.3
+Version:       30.2
 Release:       %autorelease
 License:       GPL-3.0-or-later AND CC0-1.0
 URL:           https://www.gnu.org/software/emacs/
+%if %{lua: print(select(3, string.find(rpm.expand('%version'), '%d+%.%d+%.(%d+)')) or 0)} >= 90
+Source0:       https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.xz
+Source1:       https://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}.tar.xz.sig
+%else
 Source0:       https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
 Source1:       https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz.sig
-# Emacs 29+ sign key
-Source2:       https://keys.openpgp.org/vks/v1/by-fingerprint/17E90D521672C04631B1183EE78DAE0F3115E06B
+%endif
+Source100:     https://keys.openpgp.org/vks/v1/by-fingerprint/17E90D521672C04631B1183EE78DAE0F3115E06B
+Source101:     https://keys.openpgp.org/vks/v1/by-fingerprint/CEA1DE21AB108493CC9C65742E82323B8F4353EE
+Source102:     https://keys.openpgp.org/vks/v1/by-fingerprint/12BB9B400EE3F77282864D18272B5C54E015416A
+
 Source4:       dotemacs.el
 Source5:       site-start.el
 Source6:       default.el
-# Emacs Terminal Mode, #551949, #617355
-Source7:       emacs-terminal.desktop
-Source8:       emacs-terminal.sh
 Source9:       emacs-desktop.sh
+
+Source10:      emacs_lisp.attr
+Source11:      emacs_lisp.rec
+
+# Avoid trademark issues
+Patch:         0001-Pong-and-Tetris-are-excluded.patch
+
 # rhbz#713600
-Patch1:        emacs-spellchecker.patch
-Patch2:        emacs-system-crypto-policies.patch
+Patch:         emacs-spellchecker.patch
+
+Patch:         emacs-system-crypto-policies.patch
+
 # causes a dependency on pkgconfig(systemd)
 # => remove it if we stop using this patch
-Patch3:        emacs-libdir-vs-systemd.patch
-# Avoid using the pure GTK build on X11 where it is unsupported:
-Patch4:        emacs-desktop.patch
-Patch5:        emacs-pgtk-on-x-error-message.patch
+Patch:         emacs-libdir-vs-systemd.patch
 
-BuildRequires: gcc
+# Hint what to do to avoid using the pure GTK build on X11, where it is
+# unsupported:
+Patch:         emacs-pgtk-on-x-error-message.patch
+
+# Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2276822
+# (https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63555).  If GDK ever
+# gets any new backends, this patch may need extending.
+Patch:         0002-Fall-back-to-the-terminal-from-pure-GTK-when-no-disp.patch
+
+# Don't override StartupWMClass.  The overriding value doesn't work on
+# Wayland, and the default should be fine.
+# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=49505#67
+Patch:         0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch
+
+# Don't wait for Emacs 31 before updating to Tree-sitter 0.26.
+# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=63555
+# https://bugzilla.redhat.com/show_bug.cgi?id=2420305
+Patch:         0001-Support-Tree-sitter-version-0.26-and-later.patch
+
+BuildRequires: alsa-lib-devel
 BuildRequires: atk-devel
+BuildRequires: autoconf
+BuildRequires: bzip2
+BuildRequires: cairo
 BuildRequires: cairo-devel
-BuildRequires: freetype-devel
-BuildRequires: fontconfig-devel
 BuildRequires: dbus-devel
+BuildRequires: desktop-file-utils
+BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel
+BuildRequires: gcc
 BuildRequires: giflib-devel
 BuildRequires: glibc-devel
-BuildRequires: libpng-devel
-BuildRequires: libjpeg-turbo-devel
+BuildRequires: gnupg2
+BuildRequires: gnutls-devel
+BuildRequires: gtk3-devel
+BuildRequires: gzip
+BuildRequires: harfbuzz-devel
+BuildRequires: libacl-devel
+BuildRequires: libappstream-glib
+BuildRequires: libgccjit-devel
 BuildRequires: libjpeg-turbo
+BuildRequires: libjpeg-turbo-devel
+BuildRequires: libotf-devel
+BuildRequires: libpng-devel
+BuildRequires: librsvg2-devel
+BuildRequires: libselinux-devel
 BuildRequires: libtiff-devel
+BuildRequires: libtree-sitter-devel
+BuildRequires: libwebp-devel
+BuildRequires: libxml2-devel
+BuildRequires: m17n-lib-devel
+BuildRequires: make
+BuildRequires: ncurses-devel
+BuildRequires: sqlite-devel
+BuildRequires: systemd-devel
+BuildRequires: texinfo
+BuildRequires: zlib-devel
+
+%if %{with gpm}
+BuildRequires: gpm-devel
+%endif
+
+%if %{with lucid} || %{with gtkx11}
 BuildRequires: libX11-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 BuildRequires: libXi-devel
+BuildRequires: libXpm-devel
 BuildRequires: libXrender-devel
 BuildRequires: libXt-devel
-BuildRequires: libXpm-devel
-BuildRequires: ncurses-devel
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: zlib-devel
-BuildRequires: gnutls-devel
-BuildRequires: librsvg2-devel
-BuildRequires: m17n-lib-devel
-BuildRequires: libotf-devel
-BuildRequires: libselinux-devel
-BuildRequires: alsa-lib-devel
-%if %{with gpm}
-BuildRequires: gpm-devel
-%endif
-BuildRequires: liblockfile-devel
-BuildRequires: libxml2-devel
-BuildRequires: autoconf
-BuildRequires: bzip2
-BuildRequires: cairo
-BuildRequires: texinfo
-BuildRequires: gzip
-BuildRequires: desktop-file-utils
-BuildRequires: libappstream-glib
-BuildRequires: libacl-devel
-BuildRequires: harfbuzz-devel
-BuildRequires: jansson-devel
-BuildRequires: systemd-devel
-BuildRequires: libgccjit-devel
-BuildRequires: libtree-sitter-devel
-BuildRequires: sqlite-devel
-BuildRequires: libwebp-devel
-
-BuildRequires: gtk3-devel
-%if %{with webkit}
-BuildRequires: webkit2gtk4.1-devel
 %endif
 
-BuildRequires: gnupg2
-
-# For lucid
+%if %{with lucid}
 BuildRequires: Xaw3d-devel
+%endif
 
 # for Patch3
 BuildRequires: pkgconfig(systemd)
@@ -97,15 +126,10 @@ BuildRequires: pkgconfig(systemd)
 %ifarch %{ix86}
 BuildRequires: util-linux
 %endif
-BuildRequires: make
 
-# Emacs doesn't run without a font, rhbz#732422
-Requires:      google-noto-sans-mono-vf-fonts
-Requires(preun): /usr/sbin/alternatives
-Requires(posttrans): /usr/sbin/alternatives
-Requires:      emacs-common = %{epoch}:%{version}-%{release}
-Provides:      emacs(bin) = %{epoch}:%{version}-%{release}
-Supplements:   (libwayland-server and emacs-common)
+%if "%{_lib}" == "lib64"
+%global marker ()(64bit)
+%endif
 
 %define site_lisp %{_datadir}/emacs/site-lisp
 %define site_start_d %{site_lisp}/site-start.d
@@ -113,57 +137,129 @@ Supplements:   (libwayland-server and emacs-common)
 %define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host}
 %define native_lisp %{_libdir}/emacs/%{version}/native-lisp
 
-%global desc %{expand:Emacs is a powerful, customizable, self-documenting, modeless text
-editor. Emacs contains special code editing features, a scripting
-language (elisp), and the capability to read mail, news, and more
-without leaving the editor.
+%global desc %{expand:GNU Emacs is a powerful, customizable, self-documenting, modeless text
+editor. It contains special code editing features, a scripting language
+(elisp), and the capability to read mail, news, and more without leaving
+the editor.
 }
 
+Provides:      emacs(bin) = %{epoch}:%{version}-%{release}
+Requires:      (emacs-pgtk = %{epoch}:%{version}-%{release} or emacs-gtk+x11 = %{epoch}:%{version}-%{release} or emacs-lucid = %{epoch}:%{version}-%{release} or emacs-nw = %{epoch}:%{version}-%{release})
+
+Suggests:      (emacs-nw if fedora-release-identity-basic)
+Suggests:      (emacs-nw if fedora-release-cloud)
+Suggests:      (emacs-nw if fedora-release-container)
+Suggests:      (emacs-nw if fedora-release-coreos)
+Suggests:      (emacs-gtk+x11 if fedora-release-i3)
+Suggests:      (emacs-nw if fedora-release-iot)
+Suggests:      (emacs-gtk+x11 if fedora-release-matecompiz)
+Suggests:      (emacs-pgtk if fedora-release-miraclewm)
+Suggests:      (emacs-pgtk if fedora-release-miraclewm-atomic)
+Suggests:      (emacs-pgtk if fedora-release-mobility)
+Suggests:      (emacs-nw if fedora-release-server)
+Suggests:      (emacs-pgtk if fedora-release-silverblue)
+Suggests:      (emacs-pgtk if fedora-release-sway)
+Suggests:      (emacs-pgtk if fedora-release-sway-atomic)
+Suggests:      (emacs-nw if fedora-release-toolbx)
+Suggests:      (emacs-pgtk if fedora-release-workstation)
+Suggests:      (emacs-gtk+x11 if fedora-release-xfce)
+
+## If you know the best variant for these editions, please fill
+## them in.
+# Suggests:      (emacs- if fedora-release-budgie)
+# Suggests:      (emacs- if fedora-release-budgie-atomic)
+# Suggests:      (emacs- if fedora-release-cinnamon)
+# Suggests:      (emacs- if fedora-release-compneuro)
+# Suggests:      (emacs- if fedora-release-cosmic)
+# Suggests:      (emacs- if fedora-release-cosmic-atomic)
+# Suggests:      (emacs- if fedora-release-designsuite)
+# Suggests:      (emacs- if fedora-release-kde)
+# Suggests:      (emacs- if fedora-release-kde-mobile)
+# Suggests:      (emacs- if fedora-release-kinoite)
+# Suggests:      (emacs- if fedora-release-kinoite-mobile)
+# Suggests:      (emacs- if fedora-release-lxqt)
+# Suggests:      (emacs- if fedora-release-soas)
+# Suggests:      (emacs- if fedora-release-wsl)
+
 %description
 %desc
-This package provides an emacs binary with support for Wayland, using the
-GTK toolkit.
 
-%package gtk+x11
-Summary:       GNU Emacs text editor with GTK toolkit X support
-Requires:      libgccjit
+
+%package pgtk
+Summary:       GNU Emacs text editor with GTK toolkit for Wayland
+
+# Emacs doesn't run without a font, rhbz#732422
+Requires:      google-noto-sans-mono-vf-fonts
+
 Requires(preun): /usr/sbin/alternatives
 Requires(posttrans): /usr/sbin/alternatives
 Requires:      emacs-common = %{epoch}:%{version}-%{release}
-Provides:      emacs(bin) = %{epoch}:%{version}-%{release}
-Supplements:   (xorg-x11-server-Xorg and emacs-common)
+Requires:      libpixbufloader-xpm.so%{?marker}
+Supplements:   ((libwayland-server and emacs) unless emacs-nw)
+
+%description pgtk
+%desc
+This package provides an emacs-pgtk binary with support for Wayland, using the
+GTK toolkit.
+
+
+%if %{with gtkx11}
+%package gtk+x11
+Summary:       GNU Emacs text editor with GTK toolkit for X11
+Requires:      google-noto-sans-mono-vf-fonts
+Requires(preun): /usr/sbin/alternatives
+Requires(posttrans): /usr/sbin/alternatives
+Requires:      emacs-common = %{epoch}:%{version}-%{release}
+Requires:      libpixbufloader-xpm.so%{?marker}
+Supplements:   ((xorg-x11-server-Xorg and emacs) unless emacs-nw)
 
 %description gtk+x11
 %desc
 This package provides an emacs-gtk+x11 binary with support for the X
 Window System, using the GTK toolkit.
+%endif
 
+
+%if %{with lucid}
 %package lucid
-Summary:       GNU Emacs text editor with Lucid toolkit X support
+Summary:       GNU Emacs text editor with Lucid toolkit for X11
 Requires:      google-noto-sans-mono-vf-fonts
 Requires(preun): /usr/sbin/alternatives
 Requires(posttrans): /usr/sbin/alternatives
 Requires:      emacs-common = %{epoch}:%{version}-%{release}
-Provides:      emacs(bin) = %{epoch}:%{version}-%{release}
 
 %description lucid
 %desc
 This package provides an emacs-lucid binary with support for the X
 Window System, using the Lucid toolkit.
+%endif
 
+
+%if %{with nw}
 %package nw
-Summary:       GNU Emacs text editor without X support
+Summary:       GNU Emacs text editor with no window system support
 Requires(preun): /usr/sbin/alternatives
 Requires(posttrans): /usr/sbin/alternatives
 Requires:      emacs-common = %{epoch}:%{version}-%{release}
-Provides:      emacs(bin) = %{epoch}:%{version}-%{release}
 Provides:      emacs-nox = %{epoch}:%{version}-%{release}
 Obsoletes:     emacs-nox < 1:30
 
 %description nw
 %desc
-This package provides an emacs-nw binary with no graphical display
-support, for running on a terminal.
+This package provides an emacs-nw binary without graphical display
+support, for running on a terminal only.
+%endif
+
+
+%package -n emacsclient
+Summary:       Remotely control GNU Emacs
+Conflicts:     emacs-common < 1:29.4-12
+
+%description -n emacsclient
+%desc
+This package provides emacsclient, which can be used to control an Emacs
+server.
+
 
 %package common
 Summary:       Emacs common files
@@ -172,53 +268,37 @@ Summary:       Emacs common files
 License:       GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later AND BSD-3-Clause
 Requires(preun): /usr/sbin/alternatives
 Requires(posttrans): /usr/sbin/alternatives
-Requires:      %{name}-filesystem
+Requires:      /usr/bin/readlink
+Requires:      %{name}-filesystem >= 1:30.2
+Requires:      emacsclient
 Requires:      libgccjit
-Recommends:    (emacs or emacs-gtk+x11 or emacs-lucid or emacs-nw)
+Recommends:    emacs = %{epoch}:%{version}-%{release}
 Recommends:    enchant2
 Recommends:    info
 Provides:      %{name}-el = %{epoch}:%{version}-%{release}
 Obsoletes:     emacs-el < 1:24.3-29
 # transient.el is provided by emacs in lisp/transient.el
-Provides:      emacs-transient = 0.3.7
+Provides:      emacs-transient = 0.7.2.2
 # the existing emacs-transient package is obsoleted by emacs 28+, last package
 # version as of the release of emacs 28.1 is obsoleted
 Obsoletes:     emacs-transient < 0.3.0-4
 
-# Ideally, we'd package all tree-sitter parsers as RPMs, but, in the
-# meantime, we need the following packages for
-# treesit-install-language-grammar to be able to build the parsers for
-# us at runtime:
-Recommends:    ((gcc and gcc-c++) or clang)
-Recommends:    git
-
-Recommends:    libtree-sitter-java
+# We need the following packages for treesit-install-language-grammar to
+# be able to build additional parsers for us at runtime:
+Recommends:    /usr/bin/git
+Recommends:    gcc
+Recommends:    (gcc-c++ if libtree-sitter < 0.24.0)
 
+%global _local_file_attrs emacs_lisp
+%{load:%SOURCE10}
+%global __emacs_lisp_recommends \
+        %{_builddir}/%{name}-%{version}/build-pgtk/src/emacs -x %SOURCE11
 
 %description common
 %desc
 This package contains all the common files needed by emacs, emacs-gtk+x11,
 emacs-lucid, or emacs-nw.
 
-%package terminal
-Summary:       A desktop menu item for GNU Emacs terminal.
-Requires:      emacs = %{epoch}:%{version}-%{release}
-BuildArch:     noarch
-
-%description terminal
-Contains a desktop menu item running GNU Emacs terminal. Install
-emacs-terminal if you need a terminal with Malayalam support.
-
-Please note that emacs-terminal is a temporary package and it will be
-removed when another terminal becomes capable of handling Malayalam.
-
-%package filesystem
-Summary:       Emacs filesystem layout
-BuildArch:     noarch
-
-%description filesystem
-This package provides some directories which are required by other
-packages that add functionality to Emacs.
 
 %package devel
 Summary: Development header files for Emacs
@@ -226,20 +306,21 @@ Summary: Development header files for Emacs
 %description devel
 Development header files for Emacs.
 
+
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%autosetup -p1
+cat '%{SOURCE100}' '%{SOURCE101}' '%{SOURCE102}' > keyring
+%{gpgverify} --keyring=keyring --signature='%{SOURCE1}' --data='%{SOURCE0}'
+rm keyring
 
-autoconf
-
-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
+%autosetup -N -c
+cd %{name}-%{version}
+%autopatch -p1
 
 # Avoid trademark issues
-rm -f lisp/play/tetris.el lisp/play/tetris.elc
-rm -f lisp/play/pong.el lisp/play/pong.elc
+rm lisp/play/pong.el lisp/play/pong.elc \
+   lisp/play/tetris.el lisp/play/tetris.elc
+
+autoconf
 
 %ifarch %{ix86}
 %define setarch setarch %{_arch} -R
@@ -252,23 +333,35 @@ ln -s ../../%{name}/%{version}/etc/COPYING doc
 ln -s ../../%{name}/%{version}/etc/NEWS doc
 
 
+cd ..
+%if %{with lucid}
+cp -a %{name}-%{version} build-lucid
+%endif
+%if %{with nw}
+cp -a %{name}-%{version} build-nw
+%endif
+%if %{with gtkx11}
+cp -a %{name}-%{version} build-gtk+x11
+%endif
+mv %{name}-%{version} build-pgtk
+
+
 %build
 export CFLAGS="-DMAIL_USE_LOCKF %{build_cflags}"
 %set_build_flags
 
+%if %{with lucid}
 # Build Lucid binary
-mkdir build-lucid && cd build-lucid
-ln -s ../configure .
-
-LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
-
-%configure --with-cairo \
+cd build-lucid
+%configure  \
+           --disable-gc-mark-trace \
+           --program-suffix=-lucid \
+           --with-cairo \
            --with-dbus \
            --with-gif \
            --with-gpm=no \
            --with-harfbuzz \
            --with-jpeg \
-           --with-json \
            --with-modules \
            --with-native-compilation=aot \
            --with-png \
@@ -280,15 +373,19 @@ LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
            --with-x-toolkit=lucid \
            --with-xft \
            --with-xinput2 \
-           --with-xpm
+           --with-xpm \
+    || ( cat config.log && false )
 %{setarch} %make_build bootstrap
 %{setarch} %make_build
 cd ..
+%endif
 
+%if %{with nw}
 # Build binary without X support
-mkdir build-nw && cd build-nw
-ln -s ../configure .
-%configure --with-json \
+cd build-nw
+%configure \
+           --disable-gc-mark-trace \
+           --program-suffix=-nw \
            --with-modules \
            --with-native-compilation=aot \
            --with-sqlite3 \
@@ -296,24 +393,25 @@ ln -s ../configure .
 %if %{without gpm}
            --with-gpm=no \
 %endif
-           --with-x=no
+           --with-x=no \
+    || ( cat config.log && false )
 %{setarch} %make_build bootstrap
 %{setarch} %make_build
 cd ..
+%endif
 
+%if %{with gtkx11}
 # Build GTK/X11 binary
-mkdir build-gtk+x11 && cd build-gtk+x11
-ln -s ../configure .
-
-LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
-
-%configure --with-cairo \
+cd build-gtk+x11
+%configure  \
+           --disable-gc-mark-trace \
+           --program-suffix=-gtk+x11 \
+           --with-cairo \
            --with-dbus \
            --with-gif \
            --with-gpm=no \
            --with-harfbuzz \
            --with-jpeg \
-           --with-json \
            --with-modules \
            --with-native-compilation=aot \
            --with-png \
@@ -325,24 +423,22 @@ LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
            --with-x-toolkit=gtk3 \
            --with-xinput2 \
            --with-xpm \
-           %{?with_webkit:--with-xwidgets}
+    || ( cat config.log && false )
 %{setarch} %make_build bootstrap
 %{setarch} %make_build
 cd ..
+%endif
 
 # Build pure GTK binary
-mkdir build-pgtk && cd build-pgtk
-ln -s ../configure .
-
-LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
-
-%configure --with-cairo \
+cd build-pgtk
+%configure  \
+           --disable-gc-mark-trace \
+           --with-cairo \
            --with-dbus \
            --with-gif \
            --with-gpm=no \
            --with-harfbuzz \
            --with-jpeg \
-           --with-json \
            --with-modules \
            --with-native-compilation=aot \
            --with-pgtk \
@@ -353,14 +449,11 @@ LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
            --with-tree-sitter \
            --with-webp \
            --with-xpm \
-           %{?with_webkit:--with-xwidgets}
+    || ( cat config.log && false )
 %{setarch} %make_build bootstrap
 %{setarch} %make_build
 cd ..
 
-# Remove versioned file so that we end up with .1 suffix and only one DOC file
-rm build-{gtk+x11,lucid,nw,pgtk}/src/emacs-%{version}.*
-
 # Create pkgconfig file
 cat > emacs.pc << EOF
 sitepkglispdir=%{site_lisp}
@@ -376,56 +469,103 @@ cat > macros.emacs << EOF
 %%_emacs_version %{version}
 %%_emacs_ev %{?epoch:%{epoch}:}%{version}
 %%_emacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
+%%_emacs_archsitelispdir %%{_libdir}/emacs/site-lisp
 %%_emacs_sitelispdir %{site_lisp}
 %%_emacs_sitestartdir %{site_start_d}
 %%_emacs_bytecompile(W) /usr/bin/emacs -batch --no-init-file --no-site-file --eval '(push nil load-path)' %%{-W:--eval '(setq byte-compile-error-on-warn t)' }-f batch-byte-compile %%*
 EOF
 
+cat > 00-dynamic-module-dir.el << 'EOF'
+;;; 00-dynamic-module-dir.el --- Add arch-specifc dir to load-path -*- lexical-binding: t -*-
+
+;;; Commentary:
+;;
+;; This directory is for installing Emacs dynamic modules into.  See
+;; also RPM macro %%_emacs_archsitelispdir.
+
+(add-to-list 'load-path "%{_libdir}/emacs/site-lisp")
+
+;;; 00-dynamic-module-dir.el ends here
+EOF
+
+cat > 10-source-directory.el << 'EOF'
+;;; 10-source-directory.el --- Set source-directory -*- lexical-binding: t -*-
+
+;;; Commentary:
+;;
+;; This solves rhbz#474958; Function `update-directory-autoloads' now
+;; finally works.
+
+(setq source-directory "%{_datadir}/emacs/%{version}/")
+
+;;; 10-source-directory.el ends here
+EOF
+
 %install
+%if %{with nw}
+cd build-nw
+%{__make} install-arch-dep install-eln DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
+cd ..
+%endif
+
+%if %{with lucid}
+cd build-lucid
+%{__make} install-arch-dep install-eln DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
+cd ..
+%endif
+
+%if %{with gtkx11}
+cd build-gtk+x11
+%{__make} install-arch-dep install-eln DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
+cd ..
+%endif
+
 cd build-pgtk
 %make_install
 cd ..
 
-# Let alternatives manage the symlink
-rm %{buildroot}%{_bindir}/emacs
-touch %{buildroot}%{_bindir}/emacs
-
 # Do not compress the files which implement compression itself (#484830)
 gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-compr.el.gz
 gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.el.gz
 
-# Install the emacs with GTK toolkit
-install -p -m 0755 build-gtk+x11/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-gtk+x11
+# Remove duplicate files with suffixed names
+%if %{with nw} || %{with lucid} || %{with gtkx11}
+find %{buildroot} \
+     -type f \
+     ! -name emacs-%{version}-gtk+x11 ! -name emacs-gtk+x11 \
+     ! -name emacs-%{version}-lucid   ! -name emacs-lucid \
+     ! -name emacs-%{version}-nw      ! -name emacs-nw \
+     -regextype posix-extended \
+     -regex '.*-(gtk\+x11|lucid|nw)((-mail)?\.[^/]+)?$' \
+     -print \
+     -delete
+%endif
 
-# Install the emacs with Lucid toolkit
-install -p -m 0755 build-lucid/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-lucid
+# Rename the emacs binary to indicate it's a "pure GTK" build
+mv %{buildroot}%{_bindir}/emacs-%{version} %{buildroot}%{_bindir}/emacs-%{version}-pgtk
+ln -s emacs-%{version}-pgtk %{buildroot}%{_bindir}/emacs-pgtk
 
-# Install the emacs without graphical display
-install -p -m 0755 build-nw/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-nw
+# Compatibility with earlier Fedora packages
+%if %{with nw}
 ln -s emacs-%{version}-nw %{buildroot}%{_bindir}/emacs-%{version}-nox
-ln -s emacs-nw %{buildroot}%{_bindir}/emacs-nox
+ln -s emacs-%{version}-nw %{buildroot}%{_bindir}/emacs-nox
+%endif
 
 # Make sure movemail isn't setgid
 chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
 
-mkdir -p %{buildroot}%{site_lisp}
+mkdir -p %{buildroot}%{site_lisp} %{buildroot}%{site_start_d}
 install -p -m 0644 %SOURCE5 %{buildroot}%{site_lisp}/site-start.el
 install -p -m 0644 %SOURCE6 %{buildroot}%{site_lisp}
+install -p -m 0644 00-dynamic-module-dir.el %{buildroot}%{site_start_d}/
+install -p -m 0644 10-source-directory.el %{buildroot}%{site_start_d}/
 
-# This solves bz#474958, "update-directory-autoloads" now finally
-# works the path is different each version, so we'll generate it here
-echo "(setq source-directory \"%{_datadir}/emacs/%{version}/\")" \
- >> %{buildroot}%{site_lisp}/site-start.el
-
-mv %{buildroot}%{_bindir}/{etags,etags.emacs}
 mv %{buildroot}%{_mandir}/man1/{ctags.1.gz,gctags.1.gz}
-mv %{buildroot}%{_mandir}/man1/{etags.1.gz,etags.emacs.1.gz}
 mv %{buildroot}%{_bindir}/{ctags,gctags}
+
 # BZ 927996
 mv %{buildroot}%{_infodir}/{info.info.gz,info.gz}
 
-mkdir -p %{buildroot}%{site_lisp}/site-start.d
-
 # Default initialization file
 mkdir -p %{buildroot}%{_sysconfdir}/skel
 install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs
@@ -434,25 +574,25 @@ install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs
 mkdir -p %{buildroot}/%{pkgconfig}
 install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
-# Install rpm macro definition file
-mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
-install -p -m 0644 macros.emacs %{buildroot}%{_rpmconfigdir}/macros.d/
-
-# Installing emacs-terminal binary
-install -p -m 755 %SOURCE8 %{buildroot}%{_bindir}/emacs-terminal
+# Install rpm macros
+mkdir -p \
+      %{buildroot}%{_fileattrsdir} \
+      %{buildroot}%{_rpmconfigdir} \
+      %{buildroot}%{_rpmmacrodir}
+install -p -m 0644 %SOURCE10 %{buildroot}%{_fileattrsdir}
+install -p -m 0755 %SOURCE11 %{buildroot}%{_rpmconfigdir}
+install -p -m 0644 macros.emacs %{buildroot}%{_rpmmacrodir}
 
 # After everything is installed, remove info dir
 rm -f %{buildroot}%{_infodir}/dir
 
-# Install desktop files
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
-                     %SOURCE7
-
 # Install a wrapper to avoid running the Wayland-only build on X11
 install -p -m 0755 %SOURCE9 %{buildroot}%{_bindir}/emacs-desktop
 
 # Remove duplicate desktop-related files
-rm %{buildroot}%{_datadir}/%{name}/%{version}/etc/%{name}.{desktop,service}
+rm %{buildroot}%{_datadir}/%{name}/%{version}/etc/%{name}.{desktop,metainfo.xml,service} \
+   %{buildroot}%{_datadir}/%{name}/%{version}/etc/%{name}-mail.desktop \
+   %{buildroot}%{_datadir}/%{name}/%{version}/etc/org.gnu.emacs.defaults.gschema.xml
 
 # We don't ship the client variants yet
 # https://src.fedoraproject.org/rpms/emacs/pull-request/12
@@ -480,6 +620,8 @@ for info_f in %info_files; do
 done
 # info.gz is a rename of info.info.gz and thus needs special handling
 echo "%{_infodir}/info*" >> info-filelist
+# elisp.info.gz has additional files
+echo "%{_infodir}/elisp_type_hierarchy*" >> info-filelist
 
 # Put the lists together after filtering  ./usr to /usr
 sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files
@@ -488,133 +630,175 @@ grep -vhE '%{site_lisp}(|/(default\.el|site-start\.d|site-start\.el))$' {common,
 # Remove old icon
 rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
 
-# Install all the pdmp with fingerprints
-pgtk_pdmp="emacs-$(./build-pgtk/src/emacs --fingerprint 2>&1 | sed 's/.* //').pdmp"
-install -p -m 0644 build-pgtk/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${pgtk_pdmp}
-
-gtkx11_pdmp="emacs-$(./build-gtk+x11/src/emacs --fingerprint 2>&1 | sed 's/.* //').pdmp"
-install -p -m 0644 build-gtk+x11/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${gtkx11_pdmp}
-
-lucid_pdmp="emacs-$(./build-lucid/src/emacs --fingerprint 2>&1 | sed 's/.* //').pdmp"
-install -p -m 0644 build-lucid/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${lucid_pdmp}
-
-nw_pdmp="emacs-$(./build-nw/src/emacs --fingerprint 2>&1 | sed 's/.* //').pdmp"
-install -p -m 0644 build-nw/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${nw_pdmp}
-
 # Install native compiled Lisp of all builds
-pgtk_comp_native_ver=$(ls -1 build-pgtk/native-lisp)
-gtkx11_comp_native_ver=$(ls -1 build-gtk+x11/native-lisp)
-lucid_comp_native_ver=$(ls -1 build-lucid/native-lisp)
-nw_comp_native_ver=$(ls -1 build-nw/native-lisp)
-cp -ar build-pgtk/native-lisp/${pgtk_comp_native_ver} %{buildroot}%{native_lisp}
-cp -ar build-gtk+x11/native-lisp/${gtkx11_comp_native_ver} %{buildroot}%{native_lisp}
-cp -ar build-lucid/native-lisp/${lucid_comp_native_ver} %{buildroot}%{native_lisp}
-cp -ar build-nw/native-lisp/${nw_comp_native_ver} %{buildroot}%{native_lisp}
+(TOPDIR=${PWD}
+ cd %{buildroot}
+ find ".%{native_lisp}/$(ls $TOPDIR/build-pgtk/native-lisp)" \
+      \( -type f -name '*eln' -fprintf "$TOPDIR/pgtk-filelist" "%%%%attr(755,-,-) %%p\n" \) \
+      -o \( -type d -fprintf "$TOPDIR/pgtk-dirlist" "%%%%dir %%p\n" \)
+)
+echo "%{emacs_libexecdir}/emacs-$(./build-pgtk/src/emacs --fingerprint).pdmp" \
+     >> pgtk-filelist
 
+%if %{with gtkx11}
 (TOPDIR=${PWD}
  cd %{buildroot}
- find .%{native_lisp}/${gtkx11_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/gtk+x11-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/gtk+x11-dirs "%%%%dir %%p\n" \)
+ find ".%{native_lisp}/$(ls $TOPDIR/build-gtk+x11/native-lisp)" \
+      \( -type f -name '*eln' -fprintf "$TOPDIR/gtk+x11-filelist" "%%%%attr(755,-,-) %%p\n" \) \
+      -o \( -type d -fprintf "$TOPDIR/gtk+x11-dirlist" "%%%%dir %%p\n" \)
 )
+echo "%{emacs_libexecdir}/emacs-$(./build-gtk+x11/src/emacs --fingerprint).pdmp" \
+     >> gtk+x11-filelist
+%endif
+
+%if %{with lucid}
 (TOPDIR=${PWD}
  cd %{buildroot}
- find .%{native_lisp}/${pgtk_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/pgtk-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/pgtk-dirs "%%%%dir %%p\n" \)
+ find ".%{native_lisp}/$(ls $TOPDIR/build-lucid/native-lisp)" \
+      \( -type f -name '*eln' -fprintf "$TOPDIR/lucid-filelist" "%%%%attr(755,-,-) %%p\n" \) \
+      -o \( -type d -fprintf "$TOPDIR/lucid-dirlist" "%%%%dir %%p\n" \)
 )
+echo "%{emacs_libexecdir}/emacs-$(./build-lucid/src/emacs --fingerprint).pdmp" \
+     >> lucid-filelist
+%endif
+
+%if %{with nw}
 (TOPDIR=${PWD}
  cd %{buildroot}
- find .%{native_lisp}/${lucid_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/lucid-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/lucid-dirs "%%%%dir %%p\n" \)
+ find ".%{native_lisp}/$(ls $TOPDIR/build-nw/native-lisp)" \
+      \( -type f -name '*eln' -fprintf "$TOPDIR/nw-filelist" "%%%%attr(755,-,-) %%p\n" \) \
+      -o \( -type d -fprintf "$TOPDIR/nw-dirlist" "%%%%dir %%p\n" \)
 )
-(TOPDIR=${PWD}
- cd %{buildroot}
- find .%{native_lisp}/${nw_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/nw-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/nw-dirs "%%%%dir %%p\n" \)
-)
-echo %{emacs_libexecdir}/${pgtk_pdmp} >> pgtk-eln-filelist
-echo %{emacs_libexecdir}/${gtkx11_pdmp} >> gtk+x11-eln-filelist
-echo %{emacs_libexecdir}/${lucid_pdmp} >> lucid-eln-filelist
-echo %{emacs_libexecdir}/${nw_pdmp} >> nw-eln-filelist
+echo "%{emacs_libexecdir}/emacs-$(./build-nw/src/emacs --fingerprint).pdmp" \
+     >> nw-filelist
+%endif
 
 # remove leading . from filelists
-sed -i -e "s|\.%{native_lisp}|%{native_lisp}|" *-eln-filelist *-dirs
+sed -i -e "s|\.%{native_lisp}|%{native_lisp}|" *-filelist *-dirlist
 
 # remove exec permissions from eln files to prevent the debuginfo extractor from
 # trying to extract debuginfo from them
-find %{buildroot}%{_libdir}/ -name '*eln' -type f | xargs chmod -x
+find %{buildroot}%{native_lisp}/ -name '*.eln' -type f -print0 \
+    | xargs -0 chmod -x
 
 # ensure native files are newer than byte-code files
 # see: https://bugzilla.redhat.com/show_bug.cgi?id=2157979#c11
-find %{buildroot}%{_libdir}/ -name '*eln' -type f | xargs touch
+find %{buildroot}%{native_lisp}/ -name '*.eln' -type f -print0 \
+    | xargs -0 touch
+
+export QA_SKIP_BUILD_ROOT=0
+
 
 %check
 appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml
 desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
 
-%preun
-/usr/sbin/alternatives --remove emacs %{_bindir}/emacs-%{version} || :
 
-%posttrans
-/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 || :
+%preun pgtk
+if [ $1 = 0 ]; then
+  /usr/sbin/alternatives --remove emacs %{_bindir}/emacs-desktop || :
+  /usr/sbin/alternatives --remove emacs %{_bindir}/emacs-pgtk || :
+fi
 
+%posttrans pgtk
+/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-desktop 85 || :
+/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-pgtk 80 || :
+
+%if %{with lucid}
 %preun lucid
-/usr/sbin/alternatives --remove emacs %{_bindir}/emacs-%{version}-lucid || :
-/usr/sbin/alternatives --remove emacs-lucid %{_bindir}/emacs-%{version}-lucid || :
+if [ $1 = 0 ]; then
+  /usr/sbin/alternatives --remove emacs %{_bindir}/emacs-lucid || :
+fi
 
 %posttrans lucid
-/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-lucid 70 || :
-/usr/sbin/alternatives --install %{_bindir}/emacs-lucid emacs-lucid %{_bindir}/emacs-%{version}-lucid 60 || :
+/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-lucid 70 || :
+# The preun scriptlet of packages before 29.4-5 will remove this symlink
+# after it has been installed, so we may need to put it back:
+if [ $1 = 2 -a ! -h %{_bindir}/emacs-lucid ]; then
+    ln -s emacs-%{version}-lucid %{_bindir}/emacs-lucid
+fi
+%endif
 
+%if %{with gtkx11}
 %preun gtk+x11
-/usr/sbin/alternatives --remove emacs %{_bindir}/emacs-%{version}-gtk+x11 || :
-/usr/sbin/alternatives --remove emacs-gtk+x11 %{_bindir}/emacs-%{version}-gtk+x11 || :
+if [ $1 = 0 ]; then
+  /usr/sbin/alternatives --remove emacs %{_bindir}/emacs-gtk+x11 || :
+fi
 
 %posttrans gtk+x11
-/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-gtk+x11 75 || :
-/usr/sbin/alternatives --install %{_bindir}/emacs-gtk+x11 emacs-gtk+x11 %{_bindir}/emacs-%{version}-gtk+x11 60 || :
+/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-gtk+x11 75 || :
+# The preun scriptlet of packages before 29.4-5 will remove this symlink
+# after it has been installed, so we may need to put it back:
+if [ $1 = 2 -a ! -h %{_bindir}/emacs-gtk+x11 ]; then
+    ln -s emacs-%{version}-gtk+x11 %{_bindir}/emacs-gtk+x11
+fi
+%endif
 
+%if %{with nw}
 %preun nw
-/usr/sbin/alternatives --remove emacs %{_bindir}/emacs-%{version}-nw || :
-/usr/sbin/alternatives --remove emacs-nw %{_bindir}/emacs-%{version}-nw || :
+if [ $1 = 0 ]; then
+  /usr/sbin/alternatives --remove emacs %{_bindir}/emacs-nw || :
+fi
 
 %posttrans nw
-/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nw 70 || :
-/usr/sbin/alternatives --install %{_bindir}/emacs-nw emacs-nw %{_bindir}/emacs-%{version}-nw 60 || :
+/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-nw 65 || :
+# The preun scriptlet of packages before 29.4-5 will remove this symlink
+# after it has been installed, so we may need to put it back:
+if [ $1 = 2 -a ! -h %{_bindir}/emacs-nw ]; then
+    ln -s emacs-%{version}-nw %{_bindir}/emacs-nw
+fi
+%endif
 
 %preun common
 /usr/sbin/alternatives --remove emacs.etags %{_bindir}/etags.emacs || :
 
-%posttrans common
-/usr/sbin/alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
-       --slave %{_mandir}/man1/etags.1.gz emacs.etags.man %{_mandir}/man1/etags.emacs.1.gz || :
 
-%files -f pgtk-eln-filelist -f pgtk-dirs
-%{_bindir}/emacs-%{version}
-%attr(0755,-,-) %ghost %{_bindir}/emacs
+%files
+
+%files pgtk -f pgtk-filelist -f pgtk-dirlist
+%ghost %{_bindir}/emacs
+%{_bindir}/emacs-desktop
+%{_bindir}/emacs-%{version}-pgtk
+%{_bindir}/emacs-pgtk
 %{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml
 
-%files gtk+x11 -f gtk+x11-eln-filelist -f gtk+x11-dirs
+%if %{with gtkx11}
+%files gtk+x11 -f gtk+x11-filelist -f gtk+x11-dirlist
+%ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-gtk+x11
-%attr(0755,-,-) %ghost %{_bindir}/emacs
-%attr(0755,-,-) %ghost %{_bindir}/emacs-gtk+x11
+%{_bindir}/emacs-gtk+x11
+%endif
 
-%files lucid -f lucid-eln-filelist -f lucid-dirs
+%if %{with lucid}
+%files lucid -f lucid-filelist -f lucid-dirlist
+%ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-lucid
-%attr(0755,-,-) %ghost %{_bindir}/emacs
-%attr(0755,-,-) %ghost %{_bindir}/emacs-lucid
+%{_bindir}/emacs-lucid
+%endif
 
-%files nw -f nw-eln-filelist -f nw-dirs
+%if %{with nw}
+%files nw -f nw-filelist -f nw-dirlist
+%ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-nox
 %{_bindir}/emacs-%{version}-nw
 %{_bindir}/emacs-nox
-%attr(0755,-,-) %ghost %{_bindir}/emacs
-%attr(0755,-,-) %ghost %{_bindir}/emacs-nw
+%{_bindir}/emacs-nw
+%endif
+
+%files -n emacsclient
+%license build-pgtk/etc/COPYING
+%{_bindir}/emacsclient
+%{_mandir}/man1/emacsclient.1*
 
 %files common -f common-filelist -f info-filelist
 %config(noreplace) %{_sysconfdir}/skel/.emacs
+%{_fileattrsdir}/emacs_lisp.attr
+%{_rpmconfigdir}/emacs_lisp.rec
 %{_rpmconfigdir}/macros.d/macros.emacs
-%license etc/COPYING
-%doc doc/NEWS BUGS README
+%license build-pgtk/etc/COPYING
+%doc build-pgtk/doc/NEWS build-pgtk/BUGS build-pgtk/README
 %{_bindir}/ebrowse
-%{_bindir}/emacsclient
-%{_bindir}/emacs-desktop
-%{_bindir}/etags.emacs
+%{_bindir}/etags
 %{_bindir}/gctags
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/applications/emacs-mail.desktop
@@ -625,13 +809,16 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
 %{_mandir}/man1/ebrowse.1*
 %{_mandir}/man1/emacs.1*
-%{_mandir}/man1/emacsclient.1*
-%{_mandir}/man1/etags.emacs.1*
+%{_mandir}/man1/etags.1*
 %{_mandir}/man1/gctags.1*
 %dir %{_datadir}/emacs/%{version}
 %{_datadir}/emacs/%{version}/etc
 %{_datadir}/emacs/%{version}/site-lisp
-%dir %{emacs_libexecdir}/
+%dir %{_libdir}/%{name}/%{version}
+%dir %{native_lisp}
+%dir %{_libexecdir}/emacs
+%dir %{_libexecdir}/emacs/%{version}
+%dir %{emacs_libexecdir}
 %{emacs_libexecdir}/movemail
 %{emacs_libexecdir}/hexl
 %{emacs_libexecdir}/rcs2log
@@ -640,14 +827,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
 %attr(0644,root,root) %config %{site_lisp}/site-start.el
 %{pkgconfig}/emacs.pc
 
-%files terminal
-%{_bindir}/emacs-terminal
-%{_datadir}/applications/emacs-terminal.desktop
-
-%files filesystem
-%dir %{_datadir}/emacs
-%dir %{_datadir}/emacs/site-lisp
-%dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %files devel
 %{_includedir}/emacs-module.h
diff --git a/emacs_lisp.attr b/emacs_lisp.attr
new file mode 100644
index 0000000..bf13cd7
--- /dev/null
+++ b/emacs_lisp.attr
@@ -0,0 +1,5 @@
+# -*- rpm-spec -*-
+
+%__emacs_lisp_recommends %{_rpmconfigdir}/emacs_lisp.rec
+%__emacs_lisp_path %{_datadir}/emacs/.+\.el(\.gz)?$
+%__emacs_lisp_protocol multifile
diff --git a/emacs_lisp.rec b/emacs_lisp.rec
new file mode 100755
index 0000000..acf02d7
--- /dev/null
+++ b/emacs_lisp.rec
@@ -0,0 +1,49 @@
+#!/usr/bin/emacs -x
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; Inspect Emacs Lisp files for usage of Tree-sitter parsers, and
+;; generate RPM Recommends for those.
+
+;;; Code:
+
+(setq backtrace-on-error-noninteractive nil
+      jka-compr-verbose nil)
+
+(condition-case nil
+    (while (setq filename (read-from-minibuffer ""))
+      (when (string-match-p (rx ".el" (optional ".gz") line-end)
+                                 filename)
+        (condition-case err
+            (let* ((symlink-target (file-symlink-p filename))
+                   (source-filename
+                    (if (and (stringp symlink-target)
+                             (string-match-p (rx line-start "/")
+                                             symlink-target))
+                        (file-name-concat (getenv "RPM_BUILD_ROOT")
+                                          symlink-target)
+                      filename)))
+              (with-temp-buffer
+                (insert-file-contents source-filename)
+                (setq parsers ())
+                (while
+                    (search-forward-regexp
+                     (rx "(" (or "treesit-ensure-installed"
+                                 "treesit-parser-create"
+                                 "treesit-ready-p")
+                         " '")
+                     nil t)
+                  (add-to-list 'parsers (thing-at-point 'symbol t)))
+                (when parsers
+                  (princ (concat ";" filename "\n"))
+                  (dolist (parser parsers)
+                    (princ (concat "tree-sitter(" parser ")" "\n"))))))
+
+          ;; Missing files are probably caused by "broken" symlinks
+          ;; (which may actually be fulfilled by some other package).
+          (file-missing (message "warning: %s" (error-message-string err))))))
+  (end-of-file nil))
+
+;;; emacs_lisp.rec ends here
diff --git a/site-start.el b/site-start.el
index efbb75b..87b3b13 100644
--- a/site-start.el
+++ b/site-start.el
@@ -1,9 +1,16 @@
-;;; loaded before user's ".emacs" file and default.el
+;;; site-start.el --- loaded before user's ".emacs" file and default.el -*- lexical-binding: t -*-
+
+;;; Commentary:
+;;
+;; Load *.el and *.elc in /usr/share/emacs/site-lisp/site-start.d on startup
+
+;;; Code:
 
-;; load *.el and *.elc in /usr/share/emacs/site-lisp/site-start.d on startup
 (mapc
  'load
  (delete-dups
   (mapcar 'file-name-sans-extension
           (directory-files
            "/usr/share/emacs/site-lisp/site-start.d" t "\\.elc?\\'"))))
+
+;;; site-start.el ends here
diff --git a/sources b/sources
index a02f31c..37f14cc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (emacs-29.3.tar.xz) = efaecfc46a0b88f61de477d92c08ee592b8838e6c34724151a3b1502efa7ebd4d4837733c694807e6de1ba4b8d37d2ec382c6bb2ed000b67ad8f0e11c7df2a6b
-SHA512 (emacs-29.3.tar.xz.sig) = 369cd1b2f39c57be4f343c950389a20d48f87f830b39183c8e0fbaf4f1929c5915ac82ceab5c4889dfa5ce95408857a06ff7ab877da346046a73e30d873c807c
+SHA512 (emacs-30.2.tar.xz) = 313432d11e95c74f8cd35c5b1da442e6223f5d40f9173c55883c0339ecbfb97a0bedf79177ef8902afd3e33c078a233777bed01f5caffa1e7524f17d58bfc9a2
+SHA512 (emacs-30.2.tar.xz.sig) = ab5b5d0624b37ac662cf9914e8807fc37ee273c107f1a19ca75a527b6b9a85ce35f9436d03d8a988876cce7e7bebcc6c4a1251b0ceb08785b56bf42743f246e1