diff --git a/.gitignore b/.gitignore
index 3aa373c..4486f32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,8 +40,6 @@
 /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
diff --git a/0001-Apply-display-kluge-for-PGTK-too.patch b/0001-Apply-display-kluge-for-PGTK-too.patch
new file mode 100644
index 0000000..13c9cb3
--- /dev/null
+++ b/0001-Apply-display-kluge-for-PGTK-too.patch
@@ -0,0 +1,50 @@
+From 2f348ffee3777a8e2b02814d8cc50d282d98d366 Mon Sep 17 00:00:00 2001
+From: Peter Oliver <git@mavit.org.uk>
+Date: Sun, 14 Jul 2024 21:50:33 +0100
+Subject: [PATCH 1/2] Apply --display kluge for PGTK too
+
+* src/emacs.c (main): The --display option needs the same handling
+with the PGTK backend as it does with the X11 backends.  (Bug#72118)
+---
+ src/emacs.c | 4 ++--
+ src/lisp.h  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/emacs.c b/src/emacs.c
+index 712826d57b7..ec284b16f8d 100644
+--- a/src/emacs.c
++++ b/src/emacs.c
+@@ -181,7 +181,7 @@ #define MAIN_PROGRAM
+    data on the first attempt to change it inside asynchronous code.  */
+ bool running_asynch_code;
+ 
+-#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
++#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) || defined (HAVE_NS)
+ /* If true, -d was specified, meaning we're using some window system.  */
+ bool display_arg;
+ #endif
+@@ -2014,7 +2014,7 @@ main (int argc, char **argv)
+   {
+     int count_before = skip_args;
+ 
+-#ifdef HAVE_X_WINDOWS
++#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK)
+     char *displayname = 0;
+ 
+     /* Skip any number of -d options, but only use the last one.  */
+diff --git a/src/lisp.h b/src/lisp.h
+index 5fa48cec2f0..05daceb5dff 100644
+--- a/src/lisp.h
++++ b/src/lisp.h
+@@ -4889,7 +4889,7 @@ fast_c_string_match_ignore_case (Lisp_Object regexp,
+ extern char **initial_argv;
+ extern int initial_argc;
+ extern char const *emacs_wd;
+-#if defined (HAVE_X_WINDOWS) || defined (HAVE_NS)
++#if defined (HAVE_X_WINDOWS) || defined (HAVE_PGTK) || defined (HAVE_NS)
+ extern bool display_arg;
+ #endif
+ extern Lisp_Object decode_env_path (const char *, const char *, bool);
+-- 
+2.45.2
+
diff --git a/0001-Base-puresize.patch b/0001-Base-puresize.patch
new file mode 100644
index 0000000..664ffcc
--- /dev/null
+++ b/0001-Base-puresize.patch
@@ -0,0 +1,16 @@
+diff -ruN emacs-30.1/src/puresize.h emacs-30.1-mod4/src/puresize.h
+--- emacs-30.1/src/puresize.h	2025-02-18 21:31:36.000000000 +0300
++++ emacs-30.1-mod4/src/puresize.h	2025-05-27 14:17:15.067370990 +0300
+@@ -47,8 +47,12 @@
+ #endif
+ 
+ #ifndef BASE_PURESIZE
++#if defined __i386__
++#define BASE_PURESIZE (4500000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
++#else
+ #define BASE_PURESIZE (3400000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+ #endif
++#endif
+ 
+ /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */
+ #ifndef PURESIZE_RATIO
diff --git a/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch b/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch
deleted file mode 100644
index 09f2ed7..0000000
--- a/0001-Don-t-specify-StartupWMClass-in-emacs.desktop.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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-Support-Tree-sitter-version-0.26-and-later.patch b/0001-Support-Tree-sitter-version-0.26-and-later.patch
deleted file mode 100644
index 936ca2e..0000000
--- a/0001-Support-Tree-sitter-version-0.26-and-later.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-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/12BB9B400EE3F77282864D18272B5C54E015416A b/12BB9B400EE3F77282864D18272B5C54E015416A
deleted file mode 100644
index 47fb297..0000000
--- a/12BB9B400EE3F77282864D18272B5C54E015416A
+++ /dev/null
@@ -1,31 +0,0 @@
------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/default.el b/default.el
index 7ec900f..7df4cee 100644
--- a/default.el
+++ b/default.el
@@ -1,13 +1,7 @@
-;;; 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:
+;;; 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.
 
 (setq-default smime-CA-directory "/etc/ssl/certs")
-
-;;; default.el ends here
diff --git a/dotemacs.el b/dotemacs.el
index f7ddcf9..e1bee17 100644
--- a/dotemacs.el
+++ b/dotemacs.el
@@ -1,4 +1,4 @@
-;;; -*- lexical-binding: t -*-
+;; .emacs
 
 (custom-set-variables
  ;; uncomment to always end a file with a newline
diff --git a/emacs-desktop.patch b/emacs-desktop.patch
new file mode 100644
index 0000000..2453407
--- /dev/null
+++ b/emacs-desktop.patch
@@ -0,0 +1,26 @@
+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 2f60d9d..30648ae 100755
--- a/emacs-desktop.sh
+++ b/emacs-desktop.sh
@@ -1,39 +1,16 @@
-#!/usr/bin/bash
+#!/bin/sh
 
 # The pure GTK build of emacs is not supported on X11, so try to avoid
-# using it there if there is another alternative.
+# using if there is an alternative.
 
-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
+if [ "$XDG_SESSION_TYPE" = 'x11' ]; then
+    case "$(readlink -f /usr/bin/emacs)" in
+    */emacs-*.*-pgtk)
+        if type emacs-gtk+x11 >/dev/null; then
+            exec emacs-gtk+x11 "$@"
+        elif type emacs-lucid >/dev/null; then
+            exec emacs-lucid "$@"
+        fi
         ;;
     esac
 fi
diff --git a/emacs-pgtk-on-x-error-message.patch b/emacs-pgtk-on-x-error-message.patch
index b49abee..673fd0f 100644
--- a/emacs-pgtk-on-x-error-message.patch
+++ b/emacs-pgtk-on-x-error-message.patch
@@ -1,26 +1,13 @@
-From eaaf4883aee50974eeb03e529a29585f8ddc1d9d Mon Sep 17 00:00:00 2001
-From: Bhavin Gandhi <bhavin192@geeksocket.in>
-Date: Wed, 31 May 2023 22:44:54 +0530
-Subject: [PATCH] Add package names to PGTK on X error message
-
----
- src/pgtkterm.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/pgtkterm.c b/src/pgtkterm.c
-index c00e13550bd..ce51bff5947 100644
---- a/src/pgtkterm.c
-+++ b/src/pgtkterm.c
-@@ -6680,7 +6680,8 @@ pgtk_display_x_warning (GdkDisplay *display)
+diff -ruN emacs-30.1/src/pgtkterm.c emacs-30.1-mod3/src/pgtkterm.c
+--- emacs-30.1/src/pgtkterm.c	2025-02-18 21:31:36.000000000 +0300
++++ emacs-30.1-mod3/src/pgtkterm.c	2025-05-25 19:12:51.952225248 +0300
+@@ -7000,7 +7000,8 @@
  			  " 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");
++			  " Install 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);
--- 
-2.40.1
-
diff --git a/emacs-system-crypto-policies.patch b/emacs-system-crypto-policies.patch
index f9321ce..8a8b975 100644
--- a/emacs-system-crypto-policies.patch
+++ b/emacs-system-crypto-policies.patch
@@ -1,6 +1,7 @@
---- 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,8 +1557,8 @@
+diff -ruN emacs-30.1/src/gnutls.c emacs-30.1-mod2/src/gnutls.c
+--- emacs-30.1/src/gnutls.c	2025-02-18 21:31:36.000000000 +0300
++++ emacs-30.1-mod2/src/gnutls.c	2025-05-25 18:56:46.143142320 +0300
+@@ -1974,7 +1974,7 @@
    gnutls_certificate_credentials_t x509_cred = NULL;
    gnutls_anon_client_credentials_t anon_cred = NULL;
    Lisp_Object global_init;
@@ -9,4 +10,3 @@
    char *c_hostname;
    const char *c_pass;
  
-   /* Placeholders for the property list elements.  */
diff --git a/emacs.spec b/emacs.spec
index e10f642..7802c66 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -12,25 +12,18 @@ 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
-%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
-
+Source2:       https://keys.openpgp.org/vks/v1/by-fingerprint/17E90D521672C04631B1183EE78DAE0F3115E06B
+Source3:       https://keys.openpgp.org/vks/v1/by-fingerprint/CEA1DE21AB108493CC9C65742E82323B8F4353EE
 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
 
@@ -43,25 +36,21 @@ Patch:         emacs-system-crypto-policies.patch
 # => remove it if we stop using this patch
 Patch:         emacs-libdir-vs-systemd.patch
 
-# Hint what to do to avoid using the pure GTK build on X11, where it is
-# unsupported:
+# Avoid using the pure GTK build on X11 where it is unsupported:
+Patch:         emacs-desktop.patch
 Patch:         emacs-pgtk-on-x-error-message.patch
 
+# Increase BASE_PURESIZE, can likely be removed in next release
+# as no longer on development branch
+# https://lists.gnu.org/archive/html/emacs-devel/2025-02/txtMuC0fL80Sf.txt
+# https://lists.gnu.org/archive/html/emacs-devel/2025-02/msg01027.html
+Patch:          0001-Base-puresize.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
@@ -80,6 +69,7 @@ BuildRequires: gnutls-devel
 BuildRequires: gtk3-devel
 BuildRequires: gzip
 BuildRequires: harfbuzz-devel
+BuildRequires: jansson-devel
 BuildRequires: libacl-devel
 BuildRequires: libappstream-glib
 BuildRequires: libgccjit-devel
@@ -96,6 +86,14 @@ BuildRequires: libxml2-devel
 BuildRequires: m17n-lib-devel
 BuildRequires: make
 BuildRequires: ncurses-devel
+BuildRequires: rust-tree-sitter-bash-devel
+BuildRequires: rust-tree-sitter-cli-devel
+BuildRequires: rust-tree-sitter-css-devel
+BuildRequires: rust-tree-sitter-elixir-devel
+BuildRequires: rust-tree-sitter-html-devel
+BuildRequires: rust-tree-sitter-javascript-devel
+BuildRequires: rust-tree-sitter-json-devel
+BuildRequires: rust-tree-sitter-python-devel
 BuildRequires: sqlite-devel
 BuildRequires: systemd-devel
 BuildRequires: texinfo
@@ -131,6 +129,16 @@ BuildRequires: util-linux
 %global marker ()(64bit)
 %endif
 
+# 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}
+Requires:      libpixbufloader-xpm.so%{?marker}
+Provides:      emacs(bin) = %{epoch}:%{version}-%{release}
+Supplements:   ((libwayland-server and emacs-common) unless emacs-nw)
+
 %define site_lisp %{_datadir}/emacs/site-lisp
 %define site_start_d %{site_lisp}/site-start.d
 %define pkgconfig %{_datadir}/pkgconfig
@@ -143,75 +151,23 @@ editor. It contains special code editing features, a scripting language
 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
-
-
-%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}
-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
+This package provides an emacs 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
+Summary:       GNU Emacs text editor with GTK toolkit X support
 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)
+Provides:      emacs(bin) = %{epoch}:%{version}-%{release}
+Supplements:   ((xorg-x11-server-Xorg and emacs-common) unless emacs-nw)
 
 %description gtk+x11
 %desc
@@ -219,14 +175,14 @@ 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 for X11
+Summary:       GNU Emacs text editor with Lucid toolkit X support
 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
@@ -241,6 +197,7 @@ 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
 
@@ -269,30 +226,31 @@ License:       GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later AND BSD-3-Cl
 Requires(preun): /usr/sbin/alternatives
 Requires(posttrans): /usr/sbin/alternatives
 Requires:      /usr/bin/readlink
-Requires:      %{name}-filesystem >= 1:30.2
+Requires:      %{name}-filesystem
 Requires:      emacsclient
 Requires:      libgccjit
-Recommends:    emacs = %{epoch}:%{version}-%{release}
+Recommends:    (emacs or emacs-gtk+x11 or emacs-lucid or emacs-nw)
 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.7.2.2
+Provides:      emacs-transient = 0.3.7
 # 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
 
-# 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)
+# https://github.com/tree-sitter/tree-sitter/issues/3296
+Requires:      libtree-sitter >= 0.22.5
 
-%global _local_file_attrs emacs_lisp
-%{load:%SOURCE10}
-%global __emacs_lisp_recommends \
-        %{_builddir}/%{name}-%{version}/build-pgtk/src/emacs -x %SOURCE11
+# 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:    /usr/bin/git
+
+Recommends:    libtree-sitter-java
 
 %description common
 %desc
@@ -300,6 +258,20 @@ 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 or emacs-gtk+x11 or emacs-lucid)
+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 devel
 Summary: Development header files for Emacs
 
@@ -308,13 +280,11 @@ Development header files for Emacs.
 
 
 %prep
-cat '%{SOURCE100}' '%{SOURCE101}' '%{SOURCE102}' > keyring
+cat '%{SOURCE2}' '%{SOURCE3}' > keyring
 %{gpgverify} --keyring=keyring --signature='%{SOURCE1}' --data='%{SOURCE0}'
 rm keyring
 
-%autosetup -N -c
-cd %{name}-%{version}
-%autopatch -p1
+%autosetup -p1
 
 # Avoid trademark issues
 rm lisp/play/pong.el lisp/play/pong.elc \
@@ -333,35 +303,22 @@ 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
-cd build-lucid
-%configure  \
-           --disable-gc-mark-trace \
-           --program-suffix=-lucid \
-           --with-cairo \
+mkdir build-lucid && cd build-lucid
+ln -s ../configure .
+
+%configure --with-cairo \
            --with-dbus \
            --with-gif \
            --with-gpm=no \
            --with-harfbuzz \
            --with-jpeg \
+           --with-json \
            --with-modules \
            --with-native-compilation=aot \
            --with-png \
@@ -373,19 +330,18 @@ cd build-lucid
            --with-x-toolkit=lucid \
            --with-xft \
            --with-xinput2 \
-           --with-xpm \
-    || ( cat config.log && false )
+           --with-xpm
 %{setarch} %make_build bootstrap
 %{setarch} %make_build
+rm src/emacs-%{version}.*
 cd ..
 %endif
 
 %if %{with nw}
 # Build binary without X support
-cd build-nw
-%configure \
-           --disable-gc-mark-trace \
-           --program-suffix=-nw \
+mkdir build-nw && cd build-nw
+ln -s ../configure .
+%configure --with-json \
            --with-modules \
            --with-native-compilation=aot \
            --with-sqlite3 \
@@ -393,25 +349,25 @@ cd build-nw
 %if %{without gpm}
            --with-gpm=no \
 %endif
-           --with-x=no \
-    || ( cat config.log && false )
+           --with-x=no
 %{setarch} %make_build bootstrap
 %{setarch} %make_build
+rm src/emacs-%{version}.*
 cd ..
 %endif
 
 %if %{with gtkx11}
 # Build GTK/X11 binary
-cd build-gtk+x11
-%configure  \
-           --disable-gc-mark-trace \
-           --program-suffix=-gtk+x11 \
-           --with-cairo \
+mkdir build-gtk+x11 && cd build-gtk+x11
+ln -s ../configure .
+
+%configure --with-cairo \
            --with-dbus \
            --with-gif \
            --with-gpm=no \
            --with-harfbuzz \
            --with-jpeg \
+           --with-json \
            --with-modules \
            --with-native-compilation=aot \
            --with-png \
@@ -422,23 +378,24 @@ cd build-gtk+x11
            --with-webp \
            --with-x-toolkit=gtk3 \
            --with-xinput2 \
-           --with-xpm \
-    || ( cat config.log && false )
+           --with-xpm
 %{setarch} %make_build bootstrap
 %{setarch} %make_build
+rm src/emacs-%{version}.*
 cd ..
 %endif
 
 # Build pure GTK binary
-cd build-pgtk
-%configure  \
-           --disable-gc-mark-trace \
-           --with-cairo \
+mkdir build-pgtk && cd build-pgtk
+ln -s ../configure .
+
+%configure --with-cairo \
            --with-dbus \
            --with-gif \
            --with-gpm=no \
            --with-harfbuzz \
            --with-jpeg \
+           --with-json \
            --with-modules \
            --with-native-compilation=aot \
            --with-pgtk \
@@ -448,10 +405,10 @@ cd build-pgtk
            --with-tiff \
            --with-tree-sitter \
            --with-webp \
-           --with-xpm \
-    || ( cat config.log && false )
+           --with-xpm
 %{setarch} %make_build bootstrap
 %{setarch} %make_build
+rm src/emacs-%{version}.*
 cd ..
 
 # Create pkgconfig file
@@ -469,103 +426,70 @@ 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
 
-# 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
-
-# Rename the emacs binary to indicate it's a "pure GTK" build
+# Install the emacs binary with pure GTK toolkit
 mv %{buildroot}%{_bindir}/emacs-%{version} %{buildroot}%{_bindir}/emacs-%{version}-pgtk
 ln -s emacs-%{version}-pgtk %{buildroot}%{_bindir}/emacs-pgtk
 
-# Compatibility with earlier Fedora packages
+%if %{with gtkx11}
+# Install the emacs binary using mixed GTK and X11
+install -p -m 0755 build-gtk+x11/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-gtk+x11
+ln -s emacs-%{version}-gtk+x11 %{buildroot}%{_bindir}/emacs-gtk+x11
+%endif
+
+%if %{with lucid}
+# Install the emacs with Lucid toolkit
+install -p -m 0755 build-lucid/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-lucid
+ln -s emacs-%{version}-lucid %{buildroot}%{_bindir}/emacs-lucid
+%endif
+
 %if %{with nw}
+# Install the emacs without graphical display
+install -p -m 0755 build-nw/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-nw
 ln -s emacs-%{version}-nw %{buildroot}%{_bindir}/emacs-%{version}-nox
 ln -s emacs-%{version}-nw %{buildroot}%{_bindir}/emacs-nox
+ln -s emacs-%{version}-nw %{buildroot}%{_bindir}/emacs-nw
 %endif
 
 # Make sure movemail isn't setgid
 chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
 
-mkdir -p %{buildroot}%{site_lisp} %{buildroot}%{site_start_d}
+mkdir -p %{buildroot}%{site_lisp}
 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
@@ -574,18 +498,20 @@ install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs
 mkdir -p %{buildroot}/%{pkgconfig}
 install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig}
 
-# 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}
+# 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
 
 # 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
 
@@ -620,8 +546,6 @@ 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
@@ -630,63 +554,68 @@ 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 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}
+
 # Install native compiled Lisp of all builds
+pgtk_comp_native_ver=$(ls -1 build-pgtk/native-lisp)
+cp -ar build-pgtk/native-lisp/${pgtk_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" \)
+ 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" \)
 )
-echo "%{emacs_libexecdir}/emacs-$(./build-pgtk/src/emacs --fingerprint).pdmp" \
-     >> pgtk-filelist
+echo %{emacs_libexecdir}/${pgtk_pdmp} >> pgtk-eln-filelist
 
 %if %{with gtkx11}
+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}
+
+gtkx11_comp_native_ver=$(ls -1 build-gtk+x11/native-lisp)
+cp -ar build-gtk+x11/native-lisp/${gtkx11_comp_native_ver} %{buildroot}%{native_lisp}
 (TOPDIR=${PWD}
  cd %{buildroot}
- 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" \)
+ 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" \)
 )
-echo "%{emacs_libexecdir}/emacs-$(./build-gtk+x11/src/emacs --fingerprint).pdmp" \
-     >> gtk+x11-filelist
+echo %{emacs_libexecdir}/${gtkx11_pdmp} >> gtk+x11-eln-filelist
 %endif
 
 %if %{with lucid}
+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}
+
+lucid_comp_native_ver=$(ls -1 build-lucid/native-lisp)
+cp -ar build-lucid/native-lisp/${lucid_comp_native_ver} %{buildroot}%{native_lisp}
 (TOPDIR=${PWD}
  cd %{buildroot}
- 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" \)
+ 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" \)
 )
-echo "%{emacs_libexecdir}/emacs-$(./build-lucid/src/emacs --fingerprint).pdmp" \
-     >> lucid-filelist
+echo %{emacs_libexecdir}/${lucid_pdmp} >> lucid-eln-filelist
 %endif
 
 %if %{with nw}
+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}
+
+nw_comp_native_ver=$(ls -1 build-nw/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-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" \)
+ 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}/emacs-$(./build-nw/src/emacs --fingerprint).pdmp" \
-     >> nw-filelist
+echo %{emacs_libexecdir}/${nw_pdmp} >> nw-eln-filelist
 %endif
 
 # remove leading . from filelists
-sed -i -e "s|\.%{native_lisp}|%{native_lisp}|" *-filelist *-dirlist
+sed -i -e "s|\.%{native_lisp}|%{native_lisp}|" *-eln-filelist *-dirs
 
 # remove exec permissions from eln files to prevent the debuginfo extractor from
 # trying to extract debuginfo from them
-find %{buildroot}%{native_lisp}/ -name '*.eln' -type f -print0 \
-    | xargs -0 chmod -x
+find %{buildroot}%{_libdir}/ -name '*eln' -type f | xargs chmod -x
 
 # ensure native files are newer than byte-code files
 # see: https://bugzilla.redhat.com/show_bug.cgi?id=2157979#c11
-find %{buildroot}%{native_lisp}/ -name '*.eln' -type f -print0 \
-    | xargs -0 touch
-
-export QA_SKIP_BUILD_ROOT=0
+find %{buildroot}%{_libdir}/ -name '*eln' -type f | xargs touch
 
 
 %check
@@ -694,14 +623,12 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xm
 desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
 
 
-%preun pgtk
+%preun
 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 || :
+%posttrans
 /usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-pgtk 80 || :
 
 %if %{with lucid}
@@ -741,7 +668,7 @@ if [ $1 = 0 ]; then
 fi
 
 %posttrans nw
-/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-nw 65 || :
+/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-nw 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-nw ]; then
@@ -750,35 +677,38 @@ fi
 %endif
 
 %preun common
-/usr/sbin/alternatives --remove emacs.etags %{_bindir}/etags.emacs || :
+if [ $1 = 0 ]; then
+  /usr/sbin/alternatives --remove emacs.etags %{_bindir}/etags.emacs || :
+fi
+
+%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
-
-%files pgtk -f pgtk-filelist -f pgtk-dirlist
-%ghost %{_bindir}/emacs
-%{_bindir}/emacs-desktop
+%files -f pgtk-eln-filelist -f pgtk-dirs
+%attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-pgtk
 %{_bindir}/emacs-pgtk
 %{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml
 
 %if %{with gtkx11}
-%files gtk+x11 -f gtk+x11-filelist -f gtk+x11-dirlist
-%ghost %{_bindir}/emacs
+%files gtk+x11 -f gtk+x11-eln-filelist -f gtk+x11-dirs
+%attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-gtk+x11
 %{_bindir}/emacs-gtk+x11
 %endif
 
 %if %{with lucid}
-%files lucid -f lucid-filelist -f lucid-dirlist
-%ghost %{_bindir}/emacs
+%files lucid -f lucid-eln-filelist -f lucid-dirs
+%attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-lucid
 %{_bindir}/emacs-lucid
 %endif
 
 %if %{with nw}
-%files nw -f nw-filelist -f nw-dirlist
-%ghost %{_bindir}/emacs
+%files nw -f nw-eln-filelist -f nw-dirs
+%attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-nox
 %{_bindir}/emacs-%{version}-nw
 %{_bindir}/emacs-nox
@@ -786,19 +716,18 @@ fi
 %endif
 
 %files -n emacsclient
-%license build-pgtk/etc/COPYING
+%license 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 build-pgtk/etc/COPYING
-%doc build-pgtk/doc/NEWS build-pgtk/BUGS build-pgtk/README
+%license etc/COPYING
+%doc doc/NEWS BUGS README
 %{_bindir}/ebrowse
-%{_bindir}/etags
+%{_bindir}/emacs-desktop
+%{_bindir}/etags.emacs
 %{_bindir}/gctags
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/applications/emacs-mail.desktop
@@ -807,13 +736,15 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/emacs.svg
 %{_datadir}/icons/hicolor/scalable/apps/emacs.ico
 %{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
+%{_infodir}/elisp_type_hierarchy.*
 %{_mandir}/man1/ebrowse.1*
 %{_mandir}/man1/emacs.1*
-%{_mandir}/man1/etags.1*
+%{_mandir}/man1/etags.emacs.1*
 %{_mandir}/man1/gctags.1*
 %dir %{_datadir}/emacs/%{version}
 %{_datadir}/emacs/%{version}/etc
 %{_datadir}/emacs/%{version}/site-lisp
+%dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{version}
 %dir %{native_lisp}
 %dir %{_libexecdir}/emacs
@@ -827,9 +758,13 @@ fi
 %attr(0644,root,root) %config %{site_lisp}/site-start.el
 %{pkgconfig}/emacs.pc
 
+%files terminal
+%{_bindir}/emacs-terminal
+%{_datadir}/applications/emacs-terminal.desktop
 
 %files devel
 %{_includedir}/emacs-module.h
 
+
 %changelog
 %autochangelog
diff --git a/emacs_lisp.attr b/emacs_lisp.attr
deleted file mode 100644
index bf13cd7..0000000
--- a/emacs_lisp.attr
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- 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
deleted file mode 100755
index acf02d7..0000000
--- a/emacs_lisp.rec
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/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 87b3b13..efbb75b 100644
--- a/site-start.el
+++ b/site-start.el
@@ -1,16 +1,9 @@
-;;; 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:
+;;; loaded before user's ".emacs" file and default.el
 
+;; 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