diff --git a/.gitignore b/.gitignore index a032b02..89279e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -SOURCES/emacs-26.1.tar.xz -SOURCES/package-keyring.gpg -/emacs-26.1.tar.xz -/package-keyring.gpg +emacs-29.4.tar.xz diff --git a/0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch b/0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch new file mode 100644 index 0000000..37b1845 --- /dev/null +++ b/0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch @@ -0,0 +1,62 @@ +From 123ece3c3313101048d43a5ef2f9bd66c4e97fb7 Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Fri, 23 Dec 2022 18:49:25 +0100 +Subject: [PATCH] configure: Remove obsolete check for -b i486-linuxaout + +If there are still a.out system arounds, they shouldn't need this +anymore because the toolchain has been fixed. + +* configure.ac (emacs_cv_b_link): Remove obsolete check. + +(cherry picked from commit 6c1413d5ef0d1fea639b0d8c83a0c0065d99359b) +--- + configure.ac | 33 --------------------------------- + 1 file changed, 33 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5dd182ae6e5..8a20caa8c4e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2695,39 +2695,6 @@ if test "${HAVE_X11}" = "yes"; then + export LD_RUN_PATH + fi + +- if test "${opsys}" = "gnu-linux"; then +- AC_CACHE_CHECK([whether X on GNU/Linux needs -b to link], [emacs_cv_b_link], +- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], +- [[XOpenDisplay ("foo");]])], +- [xgnu_linux_first_failure=no], +- [xgnu_linux_first_failure=yes]) +- if test "${xgnu_linux_first_failure}" = "yes"; then +- OLD_CPPFLAGS="$CPPFLAGS" +- OLD_LIBS="$LIBS" +- CPPFLAGS="$CPPFLAGS -b i486-linuxaout" +- LIBS="$LIBS -b i486-linuxaout" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], +- [[XOpenDisplay ("foo");]])], +- [xgnu_linux_second_failure=no], +- [xgnu_linux_second_failure=yes]) +- if test "${xgnu_linux_second_failure}" = "yes"; then +- # If we get the same failure with -b, there is no use adding -b. +- # So leave it out. This plays safe. +- emacs_cv_b_link=no +- else +- emacs_cv_b_link=yes +- fi +- CPPFLAGS=$OLD_CPPFLAGS +- LIBS=$OLD_LIBS +- else +- emacs_cv_b_link=no +- fi]) +- if test "x$emacs_cv_b_link" = xyes ; then +- LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -b i486-linuxaout" +- C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout" +- fi +- fi +- + # Reportedly, some broken Solaris systems have XKBlib.h but are missing + # header files included from there. + AC_CACHE_CHECK([for Xkb], [emacs_cv_xkb], +-- +2.41.0 + 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 +Comment: Stefan Kangas +Comment: Stefan Kangas + +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 +ZOTZGRs= +=fO4L +-----END PGP PUBLIC KEY BLOCK----- diff --git a/emacs-29.4.tar.xz.sig b/emacs-29.4.tar.xz.sig new file mode 100644 index 0000000..aad5b43 --- /dev/null +++ b/emacs-29.4.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFLBAABCgA1FiEEuwLkB66eqofJ5yodLU4f6VlXE10FAmZ26AAXHHN0ZWZhbmth +bmdhc0BnbWFpbC5jb20ACgkQLU4f6VlXE12pAwf8C+BIyBYVe3q7ErFAL7O1zK/k +fuL/Nh1g9pKY6JDiNx4INLi4DoFaoj4HzLj356N/m/8xZl0+J1TYOp5gR3TNiYSo +hf8Dxt9V3zEminMzXeQnrH0IMESkktpXmlhCcb5GtapO86KzYrFeZXU95fk8C3+H +7MVDo3QznLnQTUb+OythZ5d5ClN1XVNKrkcu/hdHR51lPYP4NW/zbWdCYvKsSNTD +pkr+484KAT/R2FzoyhUtbiGkJacG0AxHA7uwPqjCFcoaet/6GjkJ9UJTJo7A1VwF +9qBwS2UCLofsZpoutly+43Id+OJBmA6PbGyQayvDCPuxfX9Ok/TjWWLSY0z5wA== +=E1hc +-----END PGP SIGNATURE----- diff --git a/emacs-consider-org-file-contents-unsafe.patch b/emacs-consider-org-file-contents-unsafe.patch deleted file mode 100644 index 146dc64..0000000 --- a/emacs-consider-org-file-contents-unsafe.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2bc865ace050ff118db43f01457f95f95112b877 Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Tue, 20 Feb 2024 14:59:20 +0300 -Subject: org-file-contents: Consider all remote files unsafe - -* lisp/org/org.el (org-file-contents): When loading files, consider all -remote files (like TRAMP-fetched files) unsafe, in addition to URLs. ---- - lisp/org/org.el | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/lisp/org/org.el b/lisp/org/org.el -index 0f5d17d..76559c9 100644 ---- a/lisp/org/org.el -+++ b/lisp/org/org.el -@@ -4576,12 +4576,16 @@ from file or URL, and return nil. - If NOCACHE is non-nil, do a fresh fetch of FILE even if cached version - is available. This option applies only if FILE is a URL." - (let* ((is-url (org-file-url-p file)) -+ (is-remote (condition-case nil -+ (file-remote-p file) -+ ;; In case of error, be safe. -+ (t t))) - (cache (and is-url - (not nocache) - (gethash file org--file-cache)))) - (cond - (cache) -- (is-url -+ ((or is-url is-remote) - (with-current-buffer (url-retrieve-synchronously file) - (goto-char (point-min)) - ;; Move point to after the url-retrieve header. --- -cgit v1.1 - diff --git a/emacs-ctags-local-command-execute-vulnerability.patch b/emacs-ctags-local-command-execute-vulnerability.patch deleted file mode 100644 index e930f73..0000000 --- a/emacs-ctags-local-command-execute-vulnerability.patch +++ /dev/null @@ -1,223 +0,0 @@ -diff --git a/lib-src/etags.c b/lib-src/etags.c -index 588921bc70..a156444281 100644 ---- a/lib-src/etags.c -+++ b/lib-src/etags.c -@@ -371,7 +371,7 @@ static void just_read_file (FILE *); - - static language *get_language_from_langname (const char *); - static void readline (linebuffer *, FILE *); --static long readline_internal (linebuffer *, FILE *, char const *); -+static long readline_internal (linebuffer *, FILE *, char const *, const bool); - static bool nocase_tail (const char *); - static void get_tag (char *, char **); - static void get_lispy_tag (char *); -@@ -394,7 +394,9 @@ static void free_fdesc (fdesc *); - static void pfnote (char *, bool, char *, int, int, long); - static void invalidate_nodes (fdesc *, node **); - static void put_entries (node *); -+static void clean_matched_file_tag (char const * const, char const * const); - -+static void do_move_file (const char *, const char *); - static char *concat (const char *, const char *, const char *); - static char *skip_spaces (char *); - static char *skip_non_spaces (char *); -@@ -1307,7 +1309,7 @@ main (int argc, char **argv) - if (parsing_stdin) - fatal ("cannot parse standard input " - "AND read file names from it"); -- while (readline_internal (&filename_lb, stdin, "-") > 0) -+ while (readline_internal (&filename_lb, stdin, "-", false) > 0) - process_file_name (filename_lb.buffer, lang); - } - else -@@ -1355,9 +1357,6 @@ main (int argc, char **argv) - /* From here on, we are in (CTAGS && !cxref_style) */ - if (update) - { -- char *cmd = -- xmalloc (strlen (tagfile) + whatlen_max + -- sizeof "mv..OTAGS;grep -Fv '\t\t' OTAGS >;rm OTAGS"); - for (i = 0; i < current_arg; ++i) - { - switch (argbuffer[i].arg_type) -@@ -1368,17 +1367,8 @@ main (int argc, char **argv) - default: - continue; /* the for loop */ - } -- char *z = stpcpy (cmd, "mv "); -- z = stpcpy (z, tagfile); -- z = stpcpy (z, " OTAGS;grep -Fv '\t"); -- z = stpcpy (z, argbuffer[i].what); -- z = stpcpy (z, "\t' OTAGS >"); -- z = stpcpy (z, tagfile); -- strcpy (z, ";rm OTAGS"); -- if (system (cmd) != EXIT_SUCCESS) -- fatal ("failed to execute shell command"); -+ clean_matched_file_tag (tagfile, argbuffer[i].what); - } -- free (cmd); - append_to_tagfile = true; - } - -@@ -1407,6 +1397,51 @@ main (int argc, char **argv) - return EXIT_SUCCESS; - } - -+/* -+ * Equivalent to: mv tags OTAGS;grep -Fv ' filename ' OTAGS >tags;rm OTAGS -+ */ -+static void -+clean_matched_file_tag (const char* tagfile, const char* match_file_name) -+{ -+ FILE *otags_f = fopen ("OTAGS", "wb"); -+ FILE *tag_f = fopen (tagfile, "rb"); -+ -+ if (otags_f == NULL) -+ pfatal ("OTAGS"); -+ -+ if (tag_f == NULL) -+ pfatal (tagfile); -+ -+ int buf_len = strlen (match_file_name) + sizeof ("\t\t ") + 1; -+ char *buf = xmalloc (buf_len); -+ snprintf (buf, buf_len, "\t%s\t", match_file_name); -+ -+ linebuffer line; -+ linebuffer_init (&line); -+ while (readline_internal (&line, tag_f, tagfile, true) > 0) -+ { -+ if (ferror (tag_f)) -+ pfatal (tagfile); -+ -+ if (strstr (line.buffer, buf) == NULL) -+ { -+ fprintf (otags_f, "%s\n", line.buffer); -+ if (ferror (tag_f)) -+ pfatal (tagfile); -+ } -+ } -+ free (buf); -+ free (line.buffer); -+ -+ if (fclose (otags_f) == EOF) -+ pfatal ("OTAGS"); -+ -+ if (fclose (tag_f) == EOF) -+ pfatal (tagfile); -+ -+ do_move_file ("OTAGS", tagfile); -+ return; -+} - - /* - * Return a compressor given the file name. If EXTPTR is non-zero, -@@ -1794,7 +1829,7 @@ find_entries (FILE *inf) - - /* Else look for sharp-bang as the first two characters. */ - if (parser == NULL -- && readline_internal (&lb, inf, infilename) > 0 -+ && readline_internal (&lb, inf, infilename, false) > 0 - && lb.len >= 2 - && lb.buffer[0] == '#' - && lb.buffer[1] == '!') -@@ -6293,7 +6328,7 @@ analyze_regex (char *regex_arg) - if (regexfp == NULL) - pfatal (regexfile); - linebuffer_init (®exbuf); -- while (readline_internal (®exbuf, regexfp, regexfile) > 0) -+ while (readline_internal (®exbuf, regexfp, regexfile, false) > 0) - analyze_regex (regexbuf.buffer); - free (regexbuf.buffer); - if (fclose (regexfp) != 0) -@@ -6648,11 +6683,13 @@ get_lispy_tag (register char *bp) - - /* - * Read a line of text from `stream' into `lbp', excluding the -- * newline or CR-NL, if any. Return the number of characters read from -- * `stream', which is the length of the line including the newline. -+ * newline or CR-NL (if `leave_cr` is false), if any. Return the -+ * number of characters read from `stream', which is the length -+ * of the line including the newline. - * -- * On DOS or Windows we do not count the CR character, if any before the -- * NL, in the returned length; this mirrors the behavior of Emacs on those -+ * On DOS or Windows, if `leave_cr` is false, we do not count the -+ * CR character, if any before the NL, in the returned length; -+ * this mirrors the behavior of Emacs on those - * platforms (for text files, it translates CR-NL to NL as it reads in the - * file). - * -@@ -6660,7 +6697,7 @@ get_lispy_tag (register char *bp) - * appended to `filebuf'. - */ - static long --readline_internal (linebuffer *lbp, FILE *stream, char const *filename) -+readline_internal (linebuffer *lbp, FILE *stream, char const *filename, const bool leave_cr) - { - char *buffer = lbp->buffer; - char *p = lbp->buffer; -@@ -6691,7 +6728,7 @@ readline_internal (linebuffer *lbp, FILE *stream, char const *filename) - } - if (c == '\n') - { -- if (p > buffer && p[-1] == '\r') -+ if (!leave_cr && p > buffer && p[-1] == '\r') - { - p -= 1; - chars_deleted = 2; -@@ -6736,7 +6773,7 @@ readline (linebuffer *lbp, FILE *stream) - long result; - - linecharno = charno; /* update global char number of line start */ -- result = readline_internal (lbp, stream, infilename); /* read line */ -+ result = readline_internal (lbp, stream, infilename, false); /* read line */ - lineno += 1; /* increment global line number */ - charno += result; /* increment global char number */ - -@@ -7104,6 +7141,46 @@ etags_mktmp (void) - return templt; - } - -+static void -+do_move_file(const char *src_file, const char *dst_file) -+{ -+ if (rename (src_file, dst_file) == 0) -+ return; -+ -+ FILE *src_f = fopen (src_file, "rb"); -+ FILE *dst_f = fopen (dst_file, "wb"); -+ -+ if (src_f == NULL) -+ pfatal (src_file); -+ -+ if (dst_f == NULL) -+ pfatal (dst_file); -+ -+ int c; -+ while ((c = fgetc (src_f)) != EOF) -+ { -+ if (ferror (src_f)) -+ pfatal (src_file); -+ -+ if (ferror (dst_f)) -+ pfatal (dst_file); -+ -+ if (fputc (c, dst_f) == EOF) -+ pfatal ("cannot write"); -+ } -+ -+ if (fclose (src_f) == EOF) -+ pfatal (src_file); -+ -+ if (fclose (dst_f) == EOF) -+ pfatal (dst_file); -+ -+ if (unlink (src_file) == -1) -+ pfatal ("unlink error"); -+ -+ return; -+} -+ - /* Return a newly allocated string containing the file name of FILE - relative to the absolute directory DIR (which should end with a slash). */ - static char * 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 +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 new file mode 100755 index 0000000..d407ca3 --- /dev/null +++ b/emacs-desktop.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +# The pure GTK build of emacs is not supported on X11, so try to avoid +# using if there is an 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 +fi + +exec emacs "$@" diff --git a/emacs-etags-local-command-injection-vulnerability.patch b/emacs-etags-local-command-injection-vulnerability.patch deleted file mode 100644 index 418b7d7..0000000 --- a/emacs-etags-local-command-injection-vulnerability.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 01a4035c869b91c153af9a9132c87adb7669ea1c Mon Sep 17 00:00:00 2001 -From: lu4nx -Date: Tue, 6 Dec 2022 15:42:40 +0800 -Subject: [PATCH] Fix etags local command injection vulnerability - -* lib-src/etags.c: (escape_shell_arg_string): New function. -(process_file_name): Use it to quote file names passed to the -shell. (Bug#59817) ---- - lib-src/etags.c | 63 +++++++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 58 insertions(+), 5 deletions(-) - -diff --git a/lib-src/etags.c b/lib-src/etags.c -index d1d20858cdd..ba0092cc637 100644 ---- a/lib-src/etags.c -+++ b/lib-src/etags.c -@@ -399,6 +399,7 @@ static void put_entries (node *); - static void clean_matched_file_tag (char const * const, char const * const); - - static void do_move_file (const char *, const char *); -+static char *escape_shell_arg_string (char *); - static char *concat (const char *, const char *, const char *); - static char *skip_spaces (char *); - static char *skip_non_spaces (char *); -@@ -1670,13 +1671,16 @@ process_file_name (char *file, language *lang) - else - { - #if MSDOS || defined (DOS_NT) -- char *cmd1 = concat (compr->command, " \"", real_name); -- char *cmd = concat (cmd1, "\" > ", tmp_name); -+ int buf_len = strlen (compr->command) + strlen (" \"\" > \"\"") + strlen (real_name) + strlen (tmp_name) + 1; -+ char *cmd = xmalloc (buf_len); -+ snprintf (cmd, buf_len, "%s \"%s\" > \"%s\"", compr->command, real_name, tmp_name); - #else -- char *cmd1 = concat (compr->command, " '", real_name); -- char *cmd = concat (cmd1, "' > ", tmp_name); -+ char *new_real_name = escape_shell_arg_string (real_name); -+ char *new_tmp_name = escape_shell_arg_string (tmp_name); -+ int buf_len = strlen (compr->command) + strlen (" > ") + strlen (new_real_name) + strlen (new_tmp_name) + 1; -+ char *cmd = xmalloc (buf_len); -+ snprintf (cmd, buf_len, "%s %s > %s", compr->command, new_real_name, new_tmp_name); - #endif -- free (cmd1); - int tmp_errno; - if (system (cmd) == -1) - { -@@ -7124,6 +7128,55 @@ etags_mktmp (void) - return templt; - } - -+/* -+ * Adds single quotes around a string, if found single quotes, escaped it. -+ * Return a newly-allocated string. -+ * -+ * For example: -+ * escape_shell_arg_string("test.txt") => 'test.txt' -+ * escape_shell_arg_string("'test.txt") => ''\''test.txt' -+ */ -+static char * -+escape_shell_arg_string (char *str) -+{ -+ char *p = str; -+ int need_space = 2; /* ' at begin and end */ -+ -+ while (*p != '\0') -+ { -+ if (*p == '\'') -+ need_space += 4; /* ' to '\'', length is 4 */ -+ else -+ need_space++; -+ -+ p++; -+ } -+ -+ char *new_str = xnew (need_space + 1, char); -+ new_str[0] = '\''; -+ new_str[need_space-1] = '\''; -+ -+ int i = 1; /* skip first byte */ -+ p = str; -+ while (*p != '\0') -+ { -+ new_str[i] = *p; -+ if (*p == '\'') -+ { -+ new_str[i+1] = '\\'; -+ new_str[i+2] = '\''; -+ new_str[i+3] = '\''; -+ i += 3; -+ } -+ -+ i++; -+ p++; -+ } -+ -+ new_str[need_space] = '\0'; -+ return new_str; -+} -+ - static void - do_move_file(const char *src_file, const char *dst_file) - { --- -2.36.1 - diff --git a/emacs-htmlfontify-command-injection-vulnerability.patch b/emacs-htmlfontify-command-injection-vulnerability.patch deleted file mode 100644 index 73122c8..0000000 --- a/emacs-htmlfontify-command-injection-vulnerability.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1b4dc4691c1f87fc970fbe568b43869a15ad0d4c Mon Sep 17 00:00:00 2001 -From: Xi Lu -Date: Sat, 24 Dec 2022 16:28:54 +0800 -Subject: [PATCH] Fix htmlfontify.el command injection vulnerability. - -* lisp/htmlfontify.el (hfy-text-p): Fix command injection -vulnerability. (Bug#60295) ---- - lisp/htmlfontify.el | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el -index df4c6ab079c..389b92939cc 100644 ---- a/lisp/htmlfontify.el -+++ b/lisp/htmlfontify.el -@@ -1912,7 +1912,7 @@ hfy-make-directory - - (defun hfy-text-p (srcdir file) - "Is SRCDIR/FILE text? Uses `hfy-istext-command' to determine this." -- (let* ((cmd (format hfy-istext-command (expand-file-name file srcdir))) -+ (let* ((cmd (format hfy-istext-command (shell-quote-argument (expand-file-name file srcdir)))) - (rsp (shell-command-to-string cmd))) - (string-match "text" rsp))) - --- -2.36.1 diff --git a/emacs-libdir-vs-systemd.patch b/emacs-libdir-vs-systemd.patch new file mode 100644 index 0000000..32f6a83 --- /dev/null +++ b/emacs-libdir-vs-systemd.patch @@ -0,0 +1,31 @@ +From a56539c1d7ef7aa56e575685bdfe1406aebb518d Mon Sep 17 00:00:00 2001 +From: Peter Oliver +Date: Wed, 5 Feb 2020 12:42:04 +0000 +Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20assemble=20systemdunitdir=20fro?= + =?UTF-8?q?m=20`libdir`?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +On 64 bit Fedora, `libdir` is `/usr/lib64`, whereas systemd services +live under `/usr/lib/systemd`. +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 2c82c49fba..b2468eb824 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -208,7 +208,7 @@ appdatadir= + # Other options include ~/.config/systemd/user/, + # $XDG_RUNTIME_DIR/systemd/user/ + # It seems the user may end up having to make a manual link... +-systemdunitdir=$(libdir)/systemd/user ++systemdunitdir=$(shell pkg-config --variable=systemduserunitdir systemd) + + # Where the etc/images/icons/hicolor directory is to be installed. + icondir=$(datarootdir)/icons +-- +2.24.1 + diff --git a/emacs-man-el-shell-injection-vulnerability.patch b/emacs-man-el-shell-injection-vulnerability.patch index 3a83ee2..584d9ff 100644 --- a/emacs-man-el-shell-injection-vulnerability.patch +++ b/emacs-man-el-shell-injection-vulnerability.patch @@ -29,6 +29,29 @@ index 55cb938..d963964 100644 (if Man-downcase-section-letters-flag (setq section (downcase section))) (while slist +diff --git a/test/lisp/man-tests.el b/test/lisp/man-tests.el +index 140482e..11f5f80 100644 +--- a/test/lisp/man-tests.el ++++ b/test/lisp/man-tests.el +@@ -161,6 +161,18 @@ DESCRIPTION + (let ((button (button-at (match-beginning 0)))) + (should (and button (eq 'Man-xref-header-file (button-type button)))))))))) + ++(ert-deftest man-tests-Man-translate-references () ++ (should (equal (Man-translate-references "basename") ++ "basename")) ++ (should (equal (Man-translate-references "basename(3)") ++ "3 basename")) ++ (should (equal (Man-translate-references "basename(3v)") ++ "3v basename")) ++ (should (equal (Man-translate-references ";id") ++ "\\;id")) ++ (should (equal (Man-translate-references "-k basename") ++ "-k basename"))) ++ + (provide 'man-tests) + + ;;; man-tests.el ends here -- cgit v1.1 diff --git a/emacs-mark-contents-untrusted.patch b/emacs-mark-contents-untrusted.patch deleted file mode 100644 index 31e8437..0000000 --- a/emacs-mark-contents-untrusted.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 937b9042ad7426acdcca33e3d931d8f495bdd804 Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Tue, 20 Feb 2024 12:44:30 +0300 -Subject: * lisp/gnus/mm-view.el (mm-display-inline-fontify): Mark contents - untrusted. - ---- - lisp/gnus/mm-view.el | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el -index 2e1261c..5f234e5 100644 ---- a/lisp/gnus/mm-view.el -+++ b/lisp/gnus/mm-view.el -@@ -504,6 +504,7 @@ If MODE is not set, try to find mode automatically." - (setq coding-system (mm-find-buffer-file-coding-system))) - (setq text (buffer-string)))) - (with-temp-buffer -+ (setq untrusted-content t) - (buffer-disable-undo) - (mm-enable-multibyte) - (insert (cond ((eq charset 'gnus-decoded) --- -cgit v1.1 - diff --git a/emacs-mh-rmail-nonempty-dir.patch b/emacs-mh-rmail-nonempty-dir.patch deleted file mode 100644 index 1015420..0000000 --- a/emacs-mh-rmail-nonempty-dir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b73cde5e2815c531df7f5fd13e214a7d92f78239 Mon Sep 17 00:00:00 2001 -From: Mike Kupfer -Date: Wed, 4 Jul 2018 15:43:04 -0700 -Subject: [PATCH] Fix MH-E mail composition with GNU Mailutils (SF#485) - -* lisp/mh-e/mh-comp.el (mh-bare-components): Recursively delete -the temporary folder. ---- - lisp/mh-e/mh-comp.el | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el -index a9f809cfa1..aa22df8b18 100644 ---- a/lisp/mh-e/mh-comp.el -+++ b/lisp/mh-e/mh-comp.el -@@ -925,8 +925,10 @@ mh-bare-components - (list "-form" mh-comp-formfile))) - (setq new (make-temp-file "comp.")) - (rename-file (concat temp-folder "/" "1") new t) -- (delete-file (concat temp-folder "/" ".mh_sequences")) -- (delete-directory temp-folder) -+ ;; The temp folder could contain various metadata files. Rather -+ ;; than trying to enumerate all the known files, just do a -+ ;; recursive delete on the directory. -+ (delete-directory temp-folder t) - new)) - - (defun mh-read-draft (use initial-contents delete-contents-file) --- -2.36.1 - diff --git a/emacs-ob-latex-command-injection-vulnerability.patch b/emacs-ob-latex-command-injection-vulnerability.patch deleted file mode 100644 index 275ada9..0000000 --- a/emacs-ob-latex-command-injection-vulnerability.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a8006ea580ed74f27f974d60b598143b04ad1741 Mon Sep 17 00:00:00 2001 -From: Xi Lu -Date: Sat, 11 Mar 2023 18:53:37 +0800 -Subject: * lisp/org/ob-latex.el: Fix command injection vulnerability - -(org-babel-execute:latex): -Replaced the `(shell-command "mv BAR NEWBAR")' with `rename-file'. - -TINYCHANGE ---- - lisp/org/ob-latex.el | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/lisp/org/ob-latex.el b/lisp/org/ob-latex.el -index a2c24b3..ce39628 100644 ---- a/lisp/org/ob-latex.el -+++ b/lisp/org/ob-latex.el -@@ -218,17 +218,14 @@ This function is called by `org-babel-execute-src-block'." - (if (string-suffix-p ".svg" out-file) - (progn - (shell-command "pwd") -- (shell-command (format "mv %s %s" -- (concat (file-name-sans-extension tex-file) "-1.svg") -- out-file))) -+ (rename-file (concat (file-name-sans-extension tex-file) "-1.svg") -+ out-file t)) - (error "SVG file produced but HTML file requested"))) - ((file-exists-p (concat (file-name-sans-extension tex-file) ".html")) - (if (string-suffix-p ".html" out-file) -- (shell-command "mv %s %s" -- (concat (file-name-sans-extension tex-file) -- ".html") -- out-file) -- (error "HTML file produced but SVG file requested"))))) -+ (rename-file (concat (file-name-sans-extension tex-file) ".html") -+ out-file t) -+ (error "HTML file produced but SVG file requested"))))) - ((or (string= "pdf" extension) imagemagick) - (with-temp-file tex-file - (require 'ox-latex) --- -cgit v1.1 - diff --git a/emacs-org-link-expand-abbrev-unsafe-elisp.patch b/emacs-org-link-expand-abbrev-unsafe-elisp.patch deleted file mode 100644 index 18a0050..0000000 --- a/emacs-org-link-expand-abbrev-unsafe-elisp.patch +++ /dev/null @@ -1,78 +0,0 @@ -From f4cc61636947b5c2f0afc67174dd369fe3277aa8 Mon Sep 17 00:00:00 2001 -From: Ihor Radchenko -Date: Tue, 18 Jun 2024 13:06:44 +0200 -Subject: org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code - -* lisp/org/org.el (org-link-expand-abbrev): Refuse expanding %(...) link -abbrevs that specify unsafe function. Instead, display a warning, and -do not expand the abbrev. Clear all the text properties from the -returned link, to avoid any potential vulnerabilities caused by -properties that may contain arbitrary Elisp. ---- - lisp/org/org.el | 40 +++++++++++++++++++++++++++++----------- - 1 file changed, 29 insertions(+), 11 deletions(-) - -diff --git a/lisp/org/org.el b/lisp/org/org.el -index 7a7f4f5..8a556c7 100644 ---- a/lisp/org/org.el -+++ b/lisp/org/org.el -@@ -1152,26 +1152,44 @@ Abbreviations are defined in `org-link-abbrev-alist'." - - (defun org-link-expand-abbrev (link) - "Apply replacements as defined in `org-link-abbrev-alist'." -- (if (string-match "^\\([^:]*\\)\\(::?\\(.*\\)\\)?$" link) -+ (if (not (string-match "^\\([^:]*\\)\\(::?\\(.*\\)\\)?$" link)) link - (let* ((key (match-string 1 link)) - (as (or (assoc key org-link-abbrev-alist-local) - (assoc key org-link-abbrev-alist))) - (tag (and (match-end 2) (match-string 3 link))) - rpl) - (if (not as) - link - (setq rpl (cdr as)) -- (cond -- ((symbolp rpl) (funcall rpl tag)) -- ((string-match "%(\\([^)]+\\))" rpl) -- (replace-match -- (save-match-data -- (funcall (intern-soft (match-string 1 rpl)) tag)) t t rpl)) -- ((string-match "%s" rpl) (replace-match (or tag "") t t rpl)) -- ((string-match "%h" rpl) -- (replace-match (url-hexify-string (or tag "")) t t rpl)) -- (t (concat rpl tag))))) -- link)) -+ ;; Drop any potentially dangerous text properties like -+ ;; `modification-hooks' that may be used as an attack vector. -+ (substring-no-properties -+ (cond -+ ((symbolp rpl) (funcall rpl tag)) -+ ((string-match "%(\\([^)]+\\))" rpl) -+ (let ((rpl-fun-symbol (intern-soft (match-string 1 rpl)))) -+ ;; Using `unsafep-function' is not quite enough because -+ ;; Emacs considers functions like `genenv' safe, while -+ ;; they can potentially be used to expose private system -+ ;; data to attacker if abbreviated link is clicked. -+ (if (or (eq t (get rpl-fun-symbol 'org-link-abbrev-safe)) -+ (eq t (get rpl-fun-symbol 'pure))) -+ (replace-match -+ (save-match-data -+ (funcall (intern-soft (match-string 1 rpl)) tag)) -+ t t rpl) -+ (org-display-warning -+ (format "Disabling unsafe link abbrev: %s -+You may mark function safe via (put '%s 'org-link-abbrev-safe t)" -+ rpl (match-string 1 rpl))) -+ (setq org-link-abbrev-alist-local (delete as org-link-abbrev-alist-local) -+ org-link-abbrev-alist (delete as org-link-abbrev-alist)) -+ link -+ ))) -+ ((string-match "%s" rpl) (replace-match (or tag "") t t rpl)) -+ ((string-match "%h" rpl) -+ (replace-match (url-hexify-string (or tag "")) t t rpl)) -+ (t (concat rpl tag)))))))) - - ;;; Storing and inserting links - --- -cgit v1.1 - diff --git a/emacs-pgtk-on-x-error-message.patch b/emacs-pgtk-on-x-error-message.patch new file mode 100644 index 0000000..cfc7c3d --- /dev/null +++ b/emacs-pgtk-on-x-error-message.patch @@ -0,0 +1,26 @@ +From eaaf4883aee50974eeb03e529a29585f8ddc1d9d Mon Sep 17 00:00:00 2001 +From: Bhavin Gandhi +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) + " 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."); + 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-spellchecker.patch b/emacs-spellchecker.patch index 48c2b57..f2eab01 100644 --- a/emacs-spellchecker.patch +++ b/emacs-spellchecker.patch @@ -1,16 +1,22 @@ diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el -index 1d28de7..1daec44 100644 +index 0a3a49d868..b6c0975857 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el -@@ -200,9 +200,9 @@ - ;; cause an error; and one of the other spelling engines below is - ;; almost certainly installed in any case, for enchant to use. +@@ -191,12 +191,12 @@ Must be greater than 1." + :type 'integer) + (defcustom ispell-program-name - (or (executable-find "aspell") -+ (or (executable-find "hunspell") +- (executable-find "ispell") ++ ;; Enchant is commonly installed as `enchant-2', so use this ++ ;; name and avoid old versions of `enchant'. ++ (or (executable-find "enchant-2") + (executable-find "hunspell") +- ;; Enchant is commonly installed as `enchant-2', so use this +- ;; name and avoid old versions of `enchant'. +- (executable-find "enchant-2") + (executable-find "aspell") - (executable-find "ispell") -- (executable-find "hunspell") ++ (executable-find "ispell") "ispell") "Program invoked by \\[ispell-word] and \\[ispell-region] commands." :type 'string diff --git a/emacs.appdata.xml b/emacs.appdata.xml deleted file mode 100644 index 94ba985..0000000 --- a/emacs.appdata.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - emacs.desktop - CC0-1.0 - GPL-3.0+ - GNU Emacs - Edit text files, view pictures and binary files - -

- Emacs is a powerful, customizable, self-documenting, modeless - editor. It is used primarely to edit text, including text - documents, source code of programs, web pages and XML documents, - but can also be used to display and edit binary files. -

-

- Emacs allows efficient editing of text with shortcuts which - allow operating on letters, words, sentences, and paragraphs as - single units. This includes both moving around and operations - like copying, deleting, transposing, and pasting. Macros can be - conveniently defined to repeat sequences of commands. In - addition, Emacs is (partially) built in a scripting language - (elisp) which can also be used to define further functions - extending existing capabilities. -

-

- Emacs has extensive support for editing source code, including - programmable syntax highlighting, automatic indentation, source - code indexing, overview modes, and navigation based on language - specific units like functions and blocks. It is also possible to - invoke the compiler from within Emacs and easily move between - compiler output and corresponding positions in the source. -

-

- Emacs has multiple modules which provide further functionality. - This provides the capability to read mail, news, browse - pictures, read man and info pages, browse the web, execute - arbitrary programs, and more, without leaving the editor. -

- - - - http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png - - - http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png - - - http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png - - - http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png - - - http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png - - - http://www.gnu.org/software/emacs/ - https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html - https://my.fsf.org/donate/ - https://www.gnu.org/software/emacs/manual/ - zbyszek@in.waw.pl - - diff --git a/emacs.desktop b/emacs.desktop deleted file mode 100644 index c71b4a8..0000000 --- a/emacs.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=Emacs -GenericName=Text Editor -Comment=Edit text -Comment[zh_TW]=編輯文字 -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 -Icon=emacs -Type=Application -Terminal=false -Categories=Utility;TextEditor;X-Red-Hat-Base; -StartupWMClass=Emacs diff --git a/emacs.service b/emacs.service deleted file mode 100644 index d611118..0000000 --- a/emacs.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Emacs: the extensible, self-documenting text editor - -[Service] -Type=forking -ExecStart=/usr/bin/emacs --daemon -ExecStop=/usr/bin/emacsclient --eval "(kill-emacs)" -Restart=always - -[Install] -WantedBy=default.target diff --git a/emacs.spec b/emacs.spec index 9e3bd87..758322c 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,39 +1,50 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 10; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + %global _hardened_build 1 +%bcond gpm %[!(0%{?rhel} >= 10)] +%bcond webkit %[!(0%{?rhel} >= 10)] + # This file is encoded in UTF-8. -*- coding: utf-8 -*- Summary: GNU Emacs text editor Name: emacs Epoch: 1 -Version: 26.1 -Release: 13%{?dist} -License: GPLv3+ and CC0-1.0 +Version: 29.4 +Release: %autorelease +License: GPL-3.0-or-later AND CC0-1.0 URL: http://www.gnu.org/software/emacs/ -Group: Applications/Editors Source0: https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz -Source1: emacs.desktop -Source3: dotemacs.el -Source4: site-start.el -Source5: default.el +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/CEA1DE21AB108493CC9C65742E82323B8F4353EE +Source4: dotemacs.el +Source5: site-start.el +Source6: default.el # Emacs Terminal Mode, #551949, #617355 -Source6: emacs-terminal.desktop -Source7: emacs-terminal.sh -Source8: emacs.service -Source9: %{name}.appdata.xml -# rhbz#1810729 -Source10: package-keyring.gpg +Source7: emacs-terminal.desktop +Source8: emacs-terminal.sh +Source9: emacs-desktop.sh # rhbz#713600 Patch1: emacs-spellchecker.patch Patch2: emacs-system-crypto-policies.patch -Patch3: emacs-ctags-local-command-execute-vulnerability.patch -Patch4: emacs-mh-rmail-nonempty-dir.patch -Patch5: emacs-etags-local-command-injection-vulnerability.patch -Patch6: emacs-htmlfontify-command-injection-vulnerability.patch -Patch7: emacs-ob-latex-command-injection-vulnerability.patch -Patch8: emacs-consider-org-file-contents-unsafe.patch -Patch9: emacs-org-link-expand-abbrev-unsafe-elisp.patch -Patch10: emacs-mark-contents-untrusted.patch -Patch11: emacs-man-el-shell-injection-vulnerability.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: 0001-configure-Remove-obsolete-check-for-b-i486-linuxaout.patch +Patch6: emacs-pgtk-on-x-error-message.patch +Patch7: emacs-man-el-shell-injection-vulnerability.patch +BuildRequires: gcc BuildRequires: atk-devel BuildRequires: cairo-devel BuildRequires: freetype-devel @@ -48,6 +59,7 @@ BuildRequires: libtiff-devel BuildRequires: libX11-devel BuildRequires: libXau-devel BuildRequires: libXdmcp-devel +BuildRequires: libXi-devel BuildRequires: libXrender-devel BuildRequires: libXt-devel BuildRequires: libXpm-devel @@ -59,109 +71,149 @@ BuildRequires: librsvg2-devel BuildRequires: m17n-lib-devel BuildRequires: libotf-devel BuildRequires: libselinux-devel -BuildRequires: GConf2-devel BuildRequires: alsa-lib-devel +%if %{with gpm} BuildRequires: gpm-devel -BuildRequires: liblockfile-devel +%endif 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 BuildRequires: Xaw3d-devel +# for Patch3 +BuildRequires: pkgconfig(systemd) + %ifarch %{ix86} BuildRequires: util-linux %endif +BuildRequires: make -# Emacs doesn't run without dejavu-sans-mono-fonts, rhbz#732422 -Requires: desktop-file-utils -Requires: dejavu-sans-mono-fonts -Requires(preun): %{_sbindir}/alternatives -Requires(posttrans): %{_sbindir}/alternatives +# 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) %define site_lisp %{_datadir}/emacs/site-lisp %define site_start_d %{site_lisp}/site-start.d -%define bytecompargs -batch --no-init-file --no-site-file -f batch-byte-compile %define pkgconfig %{_datadir}/pkgconfig %define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host} -%description -Emacs is a powerful, customizable, self-documenting, modeless text +%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. +} -This package provides an emacs binary with support for X windows. +%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 +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) + +%description gtk+x11 +%desc +This package provides an emacs-gtk+x11 binary with support for the X +Window System, using the GTK toolkit. %package lucid -Summary: GNU Emacs text editor with LUCID toolkit X support -Group: Applications/Editors -Requires(preun): %{_sbindir}/alternatives -Requires(posttrans): %{_sbindir}/alternatives +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 -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. +%desc +This package provides an emacs-lucid binary with support for the X +Window System, using the Lucid toolkit. -This package provides an emacs binary with support for X windows -using LUCID toolkit. - -%package nox +%package nw Summary: GNU Emacs text editor without X support -Group: Applications/Editors -Requires(preun): %{_sbindir}/alternatives -Requires(posttrans): %{_sbindir}/alternatives +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:29.1-5 -%description nox -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. - -This package provides an emacs binary with no X windows support for running -on a terminal. +%description nw +%desc +This package provides an emacs-nw binary with no graphical display +support, for running on a terminal. %package common Summary: Emacs common files # The entire source code is GPLv3+ except lib-src/etags.c which is # also BSD. Manual (info) is GFDL. -License: GPLv3+ and GFDL and BSD -Group: Applications/Editors -Requires(preun): /sbin/install-info -Requires(preun): %{_sbindir}/alternatives -Requires(posttrans): %{_sbindir}/alternatives -Requires(post): /sbin/install-info +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 = %{epoch}:%{version}-%{release} +Requires: libgccjit +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.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 + +Requires: libtree-sitter >= 0.22.5 + +# 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 + %description common -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. - -This package contains all the common files needed by emacs, emacs-lucid -or emacs-nox. +%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. -Group: Applications/Editors Requires: emacs = %{epoch}:%{version}-%{release} BuildArch: noarch @@ -174,35 +226,24 @@ removed when another terminal becomes capable of handling Malayalam. %package filesystem Summary: Emacs filesystem layout -Group: Applications/Editors 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 + +%description devel +Development header files for Emacs. + %prep -%setup -q +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup -p1 -%patch1 -p1 -b .spellchecker -%patch2 -p1 -b .system-crypto-policies -%patch3 -p1 -b .ctags-local-command-execute-vulnerability -%patch4 -p1 -b .mh-rmail-nonempty-dir.patch -%patch5 -p1 -b .etags-local-command-injection-vulnerability -%patch6 -p1 -b .htmlfontify-command-injection-vulnerability -%patch7 -p1 -b .ob-latex-command-injection-vulnerability -%patch8 -p1 -b .consider-org-file-contents-unsafe -%patch9 -p1 -b .org-link-expand-abbrev-unsafe-elisp -%patch10 -p1 -b .mark-contents-untrusted -%patch11 -p1 -b .emacs-man-el-shell-injection-vulnerability autoconf -# We prefer our emacs.desktop file -cp %SOURCE1 etc/emacs.desktop - -# GPG key for GNU ELPA packages backported from Emacs 26.3 (#1810729) -cp %SOURCE10 etc/package-keyring.gpg - 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 \ @@ -210,24 +251,7 @@ grep -v "pong.elc" lisp/Makefile.in > lisp/Makefile.in.new \ # Avoid trademark issues rm -f lisp/play/tetris.el lisp/play/tetris.elc -rm -f lisp/play/pong.el lisp/play/pong.el - -# Sorted list of info files -%define info_files ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq-w32 efaq eieio eintr elisp emacs-gnutls emacs-mime emacs epa erc ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman - -# Since the list of info files has to be maintained, check if all info files -# from the upstream tarball are actually present in %%info_files. -cd info -fs=( $(ls *.info) ) -is=( %info_files ) -files=$(echo ${fs[*]} | sed 's/\.info//'g | sort | tr -d '\n') -for i in $(seq 0 $(( ${#fs[*]} - 1 ))); do - if test "${fs[$i]}" != "${is[$i]}.info"; then - echo Please update %%info_files: ${fs[$i]} != ${is[$i]}.info >&2 - break - fi -done -cd .. +rm -f lisp/play/pong.el lisp/play/pong.elc %ifarch %{ix86} %define setarch setarch %{_arch} -R @@ -239,42 +263,109 @@ cd .. ln -s ../../%{name}/%{version}/etc/COPYING doc ln -s ../../%{name}/%{version}/etc/NEWS doc - %build -export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS" -export LDFLAGS="$LDFLAGS -Wl,-z,relro,-z,now -fpie" - -# Build GTK+ binary -mkdir build-gtk && cd build-gtk -ln -s ../configure . - -%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ - --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \ - --with-modules -make bootstrap -%{setarch} make %{?_smp_mflags} -cd .. +export CFLAGS="-DMAIL_USE_LOCKF %{build_cflags}" +%set_build_flags # Build Lucid binary mkdir build-lucid && cd build-lucid ln -s ../configure . -%configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \ - --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \ - --with-modules -make bootstrap -%{setarch} make %{?_smp_mflags} +%configure --with-cairo \ + --with-dbus \ + --with-gif \ + --with-gpm=no \ + --with-harfbuzz \ + --with-jpeg \ + --with-json \ + --with-modules \ + --with-native-compilation=no \ + --with-png \ + --with-rsvg \ + --with-sqlite3 \ + --with-tiff \ + --with-tree-sitter \ + --with-webp \ + --with-x-toolkit=lucid \ + --with-xft \ + --with-xinput2 \ + --with-xpm +%{setarch} %make_build bootstrap +%{setarch} %make_build cd .. # Build binary without X support -mkdir build-nox && cd build-nox +mkdir build-nw && cd build-nw ln -s ../configure . -%configure --with-x=no --with-modules -%{setarch} make %{?_smp_mflags} + +%configure --with-json \ + --with-modules \ + --with-native-compilation=no \ + --with-sqlite3 \ + --with-tree-sitter \ +%if %{without gpm} + --with-gpm=no \ +%endif + --with-x=no +%{setarch} %make_build bootstrap +%{setarch} %make_build +cd .. + +# Build GTK/X11 binary +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=no \ + --with-png \ + --with-rsvg \ + --with-sqlite3 \ + --with-tiff \ + --with-tree-sitter \ + --with-webp \ + --with-x-toolkit=gtk3 \ + --with-xinput2 \ + --with-xpm \ + %{?with_webkit:--with-xwidgets} +%{setarch} %make_build bootstrap +%{setarch} %make_build +cd .. + +# Build pure GTK binary +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=no \ + --with-pgtk \ + --with-png \ + --with-rsvg \ + --with-sqlite3 \ + --with-tiff \ + --with-tree-sitter \ + --with-webp \ + --with-xpm \ + %{?with_webkit:--with-xwidgets} +%{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,lucid,nox}/src/emacs-%{version}.* +rm build-{gtk+x11,lucid,nw,pgtk}/src/emacs-%{version}.* # Create pkgconfig file cat > emacs.pc << EOF @@ -293,12 +384,12 @@ cat > macros.emacs << EOF %%_emacs_evr %{?epoch:%{epoch}:}%{version}-%{release} %%_emacs_sitelispdir %{site_lisp} %%_emacs_sitestartdir %{site_start_d} -%%_emacs_bytecompile /usr/bin/emacs -batch --no-init-file --no-site-file --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile +%%_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 %install -cd build-gtk -make install INSTALL="%{__install} -p" DESTDIR=%{buildroot} +cd build-pgtk +%make_install cd .. # Let alternatives manage the symlink @@ -309,18 +400,23 @@ touch %{buildroot}%{_bindir}/emacs 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 LUCID toolkit +# Install the emacs with GTK toolkit +install -p -m 0755 build-gtk+x11/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-gtk+x11 + +# Install the emacs with Lucid toolkit install -p -m 0755 build-lucid/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-lucid -# Install the emacs without X -install -p -m 0755 build-nox/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-nox +# 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-nw %{buildroot}%{_bindir}/emacs-nox # Make sure movemail isn't setgid chmod 755 %{buildroot}%{emacs_libexecdir}/movemail mkdir -p %{buildroot}%{site_lisp} -install -p -m 0644 %SOURCE4 %{buildroot}%{site_lisp}/site-start.el -install -p -m 0644 %SOURCE5 %{buildroot}%{site_lisp} +install -p -m 0644 %SOURCE5 %{buildroot}%{site_lisp}/site-start.el +install -p -m 0644 %SOURCE6 %{buildroot}%{site_lisp} # This solves bz#474958, "update-directory-autoloads" now finally # works the path is different each version, so we'll generate it here @@ -338,38 +434,36 @@ mkdir -p %{buildroot}%{site_lisp}/site-start.d # Default initialization file mkdir -p %{buildroot}%{_sysconfdir}/skel -install -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/skel/.emacs +install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs # Install pkgconfig file mkdir -p %{buildroot}/%{pkgconfig} install -p -m 0644 emacs.pc %{buildroot}/%{pkgconfig} -# Install app data -mkdir -p %{buildroot}/%{_datadir}/appdata -cp -a %SOURCE9 %{buildroot}/%{_datadir}/appdata - # 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 %SOURCE7 %{buildroot}%{_bindir}/emacs-terminal +install -p -m 755 %SOURCE8 %{buildroot}%{_bindir}/emacs-terminal # After everything is installed, remove info dir rm -f %{buildroot}%{_infodir}/dir -# Installing service file -mkdir -p %{buildroot}%{_userunitdir} -install -p -m 0644 %SOURCE8 %{buildroot}%{_userunitdir}/emacs.service -# Emacs 26.1 installs the upstream unit file to /usr/lib64 on 64bit archs, we don't want that -rm -f %{buildroot}/usr/lib64/systemd/user/emacs.service - # Install desktop files -mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ - %SOURCE1 -desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ - %SOURCE6 + %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} + +# We don't ship the client variants yet +# https://src.fedoraproject.org/rpms/emacs/pull-request/12 +rm %{buildroot}%{_datadir}/applications/emacsclient.desktop +rm %{buildroot}%{_datadir}/applications/emacsclient-mail.desktop # # Create file lists @@ -379,96 +473,140 @@ rm -f *-filelist {common,el}-*-files ( TOPDIR=${PWD} cd %{buildroot} - find .%{_datadir}/emacs/%{version}/lisp \ - .%{_datadir}/emacs/%{version}/lisp/leim \ - .%{_datadir}/emacs/site-lisp \( -type f -name '*.elc' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el.gz' -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \) + find .%{_datadir}/emacs/%{version}/lisp .%{site_lisp} \ + \( -type f -name '*.elc' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el.gz' -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \) ) +# Sorted list of info files +%define info_files auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq eglot eieio eintr elisp emacs-gnutls emacs-mime emacs epa erc ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido mairix-el message mh-e modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp transient url use-package vhdl-mode vip viper vtable widget wisent woman + +for info_f in %info_files; do + echo "%{_infodir}/${info_f}.info*" >> info-filelist +done +# info.gz is a rename of info.info.gz and thus needs special handling +echo "%{_infodir}/info*" >> info-filelist + # Put the lists together after filtering ./usr to /usr sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files -cat common-*-files > common-filelist -cat el-*-files common-lisp-dir-files > el-filelist +grep -vhE '%{site_lisp}(|/(default\.el|site-start\.d|site-start\.el))$' {common,el}-*-files > common-filelist # 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} + +echo %{emacs_libexecdir}/${pgtk_pdmp} >> pgtk-filelist +echo %{emacs_libexecdir}/${gtkx11_pdmp} >> gtk+x11-filelist +echo %{emacs_libexecdir}/${lucid_pdmp} >> lucid-filelist +echo %{emacs_libexecdir}/${nw_pdmp} >> nw-filelist + +%check +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml +desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop + %preun -%{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version} +/usr/sbin/alternatives --remove emacs %{_bindir}/emacs-%{version} || : %posttrans -%{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 +/usr/sbin/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 || : %preun lucid -%{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version}-lucid -%{_sbindir}/alternatives --remove emacs-lucid %{_bindir}/emacs-%{version}-lucid +/usr/sbin/alternatives --remove emacs %{_bindir}/emacs-%{version}-lucid || : +/usr/sbin/alternatives --remove emacs-lucid %{_bindir}/emacs-%{version}-lucid || : %posttrans lucid -%{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-lucid 70 -%{_sbindir}/alternatives --install %{_bindir}/emacs-lucid emacs-lucid %{_bindir}/emacs-%{version}-lucid 60 +/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 || : -%preun nox -%{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version}-nox -%{_sbindir}/alternatives --remove emacs-nox %{_bindir}/emacs-%{version}-nox +%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 || : -%posttrans nox -%{_sbindir}/alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 -%{_sbindir}/alternatives --install %{_bindir}/emacs-nox emacs-nox %{_bindir}/emacs-%{version}-nox 60 +%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 || : -%post common -for f in %{info_files}; do - /sbin/install-info %{_infodir}/$f.info.gz %{_infodir}/dir 2> /dev/null || : -done +%preun nw +/usr/sbin/alternatives --remove emacs %{_bindir}/emacs-%{version}-nw || : +/usr/sbin/alternatives --remove emacs-nw %{_bindir}/emacs-%{version}-nw || : + +%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 || : %preun common -%{_sbindir}/alternatives --remove emacs.etags %{_bindir}/etags.emacs -if [ "$1" = 0 ]; then - for f in %{info_files}; do - /sbin/install-info --delete %{_infodir}/$f.info.gz %{_infodir}/dir 2> /dev/null || : - done -fi +/usr/sbin/alternatives --remove emacs.etags %{_bindir}/etags.emacs || : %posttrans common -%{_sbindir}/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 +/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 -f pgtk-filelist %{_bindir}/emacs-%{version} %attr(0755,-,-) %ghost %{_bindir}/emacs -%{_datadir}/applications/emacs.desktop -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/icons/hicolor/*/apps/emacs.png -%{_datadir}/icons/hicolor/scalable/apps/emacs.svg -%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg +%{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml -%files lucid +%files gtk+x11 -f gtk+x11-filelist +%{_bindir}/emacs-%{version}-gtk+x11 +%attr(0755,-,-) %ghost %{_bindir}/emacs +%attr(0755,-,-) %ghost %{_bindir}/emacs-gtk+x11 + +%files lucid -f lucid-filelist %{_bindir}/emacs-%{version}-lucid %attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs-lucid -%files nox +%files nw -f nw-filelist %{_bindir}/emacs-%{version}-nox +%{_bindir}/emacs-%{version}-nw +%{_bindir}/emacs-nox %attr(0755,-,-) %ghost %{_bindir}/emacs -%attr(0755,-,-) %ghost %{_bindir}/emacs-nox +%attr(0755,-,-) %ghost %{_bindir}/emacs-nw -%files common -f common-filelist -f el-filelist +%files common -f common-filelist -f info-filelist %config(noreplace) %{_sysconfdir}/skel/.emacs %{_rpmconfigdir}/macros.d/macros.emacs %license etc/COPYING %doc doc/NEWS BUGS README %{_bindir}/ebrowse %{_bindir}/emacsclient +%{_bindir}/emacs-desktop %{_bindir}/etags.emacs %{_bindir}/gctags -%{_mandir}/*/* -%{_infodir}/* +%{_datadir}/applications/emacs.desktop +%{_datadir}/applications/emacs-mail.desktop +%{_metainfodir}/%{name}.metainfo.xml +%{_datadir}/icons/hicolor/*/apps/emacs.png +%{_datadir}/icons/hicolor/scalable/apps/emacs.svg +%{_datadir}/icons/hicolor/scalable/apps/emacs.ico +%{_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/gctags.1* %dir %{_datadir}/emacs/%{version} %{_datadir}/emacs/%{version}/etc %{_datadir}/emacs/%{version}/site-lisp -%{_libexecdir}/emacs +%dir %{emacs_libexecdir}/ +%{emacs_libexecdir}/movemail +%{emacs_libexecdir}/hexl +%{emacs_libexecdir}/rcs2log %{_userunitdir}/emacs.service -%attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el -%attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el +%attr(0644,root,root) %config(noreplace) %{site_lisp}/default.el +%attr(0644,root,root) %config %{site_lisp}/site-start.el %{pkgconfig}/emacs.pc %files terminal @@ -480,1769 +618,80 @@ fi %dir %{_datadir}/emacs/site-lisp %dir %{_datadir}/emacs/site-lisp/site-start.d +%files devel +%{_includedir}/emacs-module.h + %changelog -* Wed Feb 19 2025 Jacek Migacz - 1:26.1-13 -- Fix man.el shell injection vulnerability (RHEL-79016) +## START: Generated by rpmautospec +* Mon Mar 10 2025 Jacek Migacz - 1:29.4-10 +- Fix man.el shell injection vulnerability -* Fri Aug 23 2024 Jacek Migacz - 1:26.1-12 -- org-file-contents: Consider all remote files unsafe (CVE-2024-30205) -- org-link-expand-abbrev: Do not evaluate arbitrary unsafe Elisp code (CVE-2024-39331) -- Make Gnus treats inline MIME contents as untrusted (CVE-2024-30203) -- Disable xwidgets (RHEL-14549) +* Thu Nov 14 2024 Jacek Migacz - 1:29.4-9 +- Add libtree-sitter as runtime dependency -* Wed Apr 12 2023 Jacek Migacz - 1:26.1-11 -- Bump version +* Wed Nov 13 2024 Jacek Migacz - 1:29.4-8 +- Bump release -* Fri Apr 7 2023 Jacek Migacz - 1:26.1-10 -- Fix etags local command injection vulnerability (#2175189) -- Fix htmlfontify.el command injection vulnerability (#2175178) -- Fix ob-latex.el command injection vulnerability (#2180587) +* Tue Oct 29 2024 Troy Dawson - 1:29.4-7 +- Bump release for October 2024 mass rebuild: -* Tue Jan 10 2023 Jacek Migacz - 1:26.1-9 -- Fix MH-E mail composition with GNU Mailutils (#1991156) +* Wed Sep 18 2024 Lukáš Zaoral - 1:29.4-6 +- tests: fix filter to include missing gating tests -* Thu Jan 05 2023 Jacek Migacz - 1:26.1-8 -- Fix ctags local command execute vulnerability (#2149386) +* Wed Sep 18 2024 Lukáš Zaoral - 1:29.4-5 +- tests: fix URL to internal tests repo -* Thu Aug 5 2021 Jacek Migacz - 1:26.1-7 -- provide gating.yaml for CI +* Thu Aug 22 2024 Jacek Migacz - 1:29.4-4 +- Unset custom linker flags -* Mon Jul 19 2021 Jacek Migacz - 1:26.1-6 -- a new GPG key for GNU ELPA packages (#1810729) +* Thu Aug 22 2024 Jacek Migacz - 1:29.4-3 +- Improve the security of the generated code by hardening -* Mon Sep 10 2018 Jan Synáček - 1:26.1-5 -- review annocheck distro flag failures (#1624109) +* Wed Aug 21 2024 Jacek Migacz - 1:29.4-2 +- Disable Native-Compilation feature -* Tue Aug 14 2018 Jan Synáček - 1:26.1-4 -- remove ImageMagick dependency (#1564992) +* Wed Aug 07 2024 Jacek Migacz - 1:29.4-1 +- Rebase to version 29.4 -* Mon Aug 13 2018 Jan Synáček - 1:26.1-3 -- remove python dependencies, emacs*.py have not been there for a while +* Tue Aug 06 2024 Frantisek Sumsal - 1:29.2-7 +- Add gating configuration for C10S/RHEL10 -* Mon Jun 18 2018 Jan Synáček - 1:26.1-2 -- remove build dependency on python2 (#1591707) +* Mon Jun 24 2024 Troy Dawson - 1:29.2-6 +- Bump release for June 2024 mass rebuild -* Wed May 30 2018 Jan Synáček - 1:26.1-1 -- emacs-26.1 is available (#1583433) +* Mon Apr 29 2024 Pavol Žáčik - 1:29.2-5 +- Remove liblockfile dependency -* Wed Apr 4 2018 Jan Synáček - 1:25.3-9 -- Emacs crashes when loading color fonts (#1519038) +* Tue Feb 06 2024 Yaakov Selkowitz - 1:29.2-4 +- Disable gpm on ELN -* Sun Feb 11 2018 Sandro Mani - 1:25.3-8 -- Rebuild (giflib) +* Wed Jan 24 2024 Fedora Release Engineering - 1:29.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Fri Feb 09 2018 Igor Gnatenko - 1:25.3-7 -- Escape macros in %%changelog +* Mon Jan 22 2024 Peter Oliver - 1:29.2-2 +- Remember to update sources. -* Wed Feb 07 2018 Fedora Release Engineering - 1:25.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Mon Jan 22 2024 Peter Oliver - 1:29.2-1 +- Update to version 29.2 -* Fri Jan 12 2018 Tomas Popela - 1:25.3-5 -- Adapt to the webkitgtk4 rename +* Wed Jan 17 2024 Tim Landscheidt - 1:29.1-16 +- Add -W option to %%_emacs_bytecompile -* Thu Jan 11 2018 Igor Gnatenko - 1:25.3-4 -- Remove obsolete scriptlets +* Fri Jan 05 2024 Lukáš Zaoral - 1:29.1-15 +- use correct BuildRequires for SQLite support -* Thu Sep 14 2017 Pete Walter - 1:25.3-3 -- Rebuilt for ImageMagick 6.9.9 soname bump +* Sun Nov 19 2023 Peter Oliver - 1:29.1-14 +- Recommend libtree-sitter-java. -* Wed Sep 13 2017 Richard W.M. Jones - 1:25.3-2 -- Rebuild to try to fix: libwebkit2gtk-4.0.so.37: undefined symbol: - soup_auth_manager_clear_cached_credentials +* Tue Nov 07 2023 Yaakov Selkowitz - 1:29.1-13 +- Fix alternatives dependencies -* Tue Sep 12 2017 Jan Synáček - 1:25.3-1 -- update to 25.3 (#1490649 #1490409) +* Sat Oct 21 2023 Peter Oliver - 1:29.1-12 +- Fix typo. -* Wed Sep 06 2017 Michael Cronenworth - 1:25.2-10 -- Rebuild for ImageMagick 6 +* Sat Oct 21 2023 Peter Oliver - 1:29.1-11 +- Fix typo. -* Fri Aug 25 2017 Michael Cronenworth - 1:25.2-9 -- Add patch for ImageMagick 7 detection - -* Fri Aug 25 2017 Igor Gnatenko - 1:25.2-8 -- Rebuilt for ImageMagick soname bump - -* Wed Aug 02 2017 Fedora Release Engineering - 1:25.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Sun Jul 30 2017 Florian Weimer - 1:25.2-6 -- Rebuild with binutils fix for ppc64le (#1475636) - -* Fri Jul 28 2017 Björn Esser - 1:25.2-5 -- Rebuilt for new ImageMagick so-name - -* Wed Jul 26 2017 Fedora Release Engineering - 1:25.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Jul 14 2017 Gregory Shimansky - 25.2-3 -- Added package with LUCID X toolkit support (#1471258) - -* Fri Apr 28 2017 Jan Synáček - 25.2-2 -- compile with support for dynamic modules (#1421087) - -* Mon Apr 24 2017 Jan Synáček - 25.2-1 -- update to 25.2 (#1444818) - -* Mon Feb 27 2017 Jan Synáček - 25.2-0.1-rc2 -- update to 25.2 rc2 -- depend on the latest webkit (#1375834) - -* Wed Feb 01 2017 Stephen Gallagher - 25.1-4 -- Add missing %%license macro - -* Mon Dec 12 2016 Jan Synáček - 1:25.1-3 -- Emacs 25.1 fc25 often crashes with emacs-auctex (#1398718) - -* Wed Oct 12 2016 Jan Synáček - 1:25.1-2 -- emacs leaves behind corrupted symlinks on CIFS share (#1271407) - -* Mon Sep 19 2016 Jan Synáček - 1:25.1-1 -- update to 25.1 (#1377031) - -* Wed Sep 14 2016 Richard Hughes - 1:25.1-0.4.rc2 -- Upgrade AppData file to specification 0.6+ - -* Tue Aug 30 2016 Jan Synáček - 1:25.1-0.3.rc2 -- update to 25.1 rc2 - -* Mon Jul 25 2016 Jan Synáček - 1:25.1-0.2.rc1 -- do not set frame-title-format in default.el (#1359732) - -* Mon Jul 25 2016 Jan Synáček - 1:25.1-0.1.rc1 -- update to 25.1 rc1 - -* Fri Jul 22 2016 Jan Synáček - 1:25.0.95-4 -- fix: emacs build failure due to high memory consumption on ppc64 (#1356919) - -* Mon Jul 18 2016 Jan Synáček - 1:25.0.95-3 -- workaround: emacs build failure due to high memory consumption on ppc64 (#1356919) - (patch provided by Sinny Kumari) - -* Thu Jul 14 2016 Jan Synáček - 1:25.0.95-2 -- fix: info file entries are not installed (#1350128) - -* Mon Jun 13 2016 Jan Synáček - 1:25.0.95-1 -- update to 25.0.95 - -* Wed May 18 2016 Jan Synáček - 1:25.0.94-1 -- update to 25.0.94 - -* Tue May 3 2016 Jan Synáček - 1:25.0.93-2 -- emacs starts in a very small window (#1332451) - -* Mon Apr 25 2016 Jan Synáček - 1:25.0.93 -- update to 25.0.93 and enable webkit support - -* Fri Mar 4 2016 Jan Synáček - 1:25.0.92 -- update to 25.0.92 - -* Mon Feb 15 2016 Jan Synáček - 1:24.5-10 -- fix build failure on ppc64le (#1306793) - -* Mon Feb 8 2016 Jan Synáček - 1:24.5-10 -- refix: set default value for smime-CA-directory (#1131558) - -* Tue Feb 2 2016 Jan Synáček - 1:24.5-9 -- emacs "deadlocked" after using mercurial with huge amounts of ignored files in the repository (#1232422) -- GDB interface gets confused by non-ASCII (#1283412) - -* Tue Jan 5 2016 Jan Synáček - 1:24.5-9 -- set default value for smime-CA-directory (#1131558) -- remove emacsclient.desktop (#1175969) - -* Tue Nov 10 2015 Fedora Release Engineering - 1:24.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Fri Sep 18 2015 Richard Hughes - 1:24.5-7 -- Remove no longer required AppData file - -* Fri Sep 11 2015 Petr Hracek - 1:24.5-6 -- Support BBDB >= 3 (EUDC) (#1261668) - -* Wed Jun 17 2015 Petr Hracek - 1:24.5-5 -- game and Trademark problem (#1231676) - -* Wed Jun 17 2015 Fedora Release Engineering - 1:24.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon May 11 2015 Petr Hracek - 1:24.5-3 -- Utilize system-wide crypto-policies (#1179285) - -* Wed Apr 22 2015 Petr Hracek - 1:24.5-2 -- Build with ACL support (#1208945) - -* Tue Apr 14 2015 Petr Hracek - 1:24.5-1 -- New upstream version 24.5 (#1210919) - -* Tue Apr 7 2015 Petr Hracek - 1:24.4-6 -- emacs grep warns 'GREP_OPTIONS is deprecated' (#1176547) - -* Thu Mar 26 2015 Richard Hughes - 1:24.4-5 -- Add an AppData file for the software center - -* Tue Mar 17 2015 Petr Hracek - 1:24.4-4 -- emacs option --no-bitmap-icon does not work (#1199160) - -* Tue Nov 18 2014 Petr Hracek - 1:24.4-3 -- Resolves #1124892 Add appdata file - -* Wed Oct 29 2014 Petr Hracek - 1:24.4-2 -- Bump version. Correct obsolete version - -* Mon Oct 27 2014 Petr Hracek - 1:24.4-1 -- resolves: #1155101 - Update to the newest upstream version (24.4) - -* Thu Oct 23 2014 Petr Hracek - 1:24.3-29 -- resolves: #1151652 - emacs-el files are part of emacs-common - -* Thu Oct 23 2014 Petr Hracek - 1:24.3-28 -- resolves: #1151652 - emacs-el is required by emacs-common - -* Tue Sep 30 2014 jchaloup - 1:24.3-27 -- resolves: #1147912 - Service dont start. Must be replace: "Type=Forking" > "Type=forking". - -* Mon Aug 18 2014 jchaloup - 1:24.3-26 -- resolves: #1130587 - unremove emacs from emacs-nox package, emacs and emacs-nox co-exist - -* Sat Aug 16 2014 Fedora Release Engineering - 1:24.3-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Aug 13 2014 Petr Hracek - 1:24.3-24 -- emacs.service file for systemd (#1128723) - -* Tue Aug 05 2014 jchaloup - 1:24.3-23 -- resolves: #1104012 - initialize kbd_macro_ptr and kbd_macro_end to kdb_macro_buffer - -* Mon Aug 04 2014 Petr Hracek - 1:24.3-22 -- remove /usr/bin/emacs-nox from install section - -* Mon Aug 04 2014 Petr Hracek - 1:24.3-21 -- /usr/bin/emacs-nox link marked as %%ghost file (#1123573) - -* Fri Aug 01 2014 Petr Hracek - 1:24.3-20 -- Provide /usr/bin/emacs-nox (#1123573) - -* Mon Jul 28 2014 Petr Hracek - 1:24.3-19 -- Add patch to remove timstamp from .elc files (#1122157) - -* Sat Jun 07 2014 Fedora Release Engineering - 1:24.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 20 2014 Petr Hracek - 1:24.3-17 -- CVE-2014-3421 CVE-2014-3422 CVE-2014-3423 CVE-2014-3424 (#1095587) - -* Thu Apr 17 2014 Petr Hracek - 1:24.3-16 -- Info files are not installed (#1062792) - -* Fri Apr 11 2014 Richard W.M. Jones - 1:24.3-16 -- Rebuild because of unannounced ImageMagick soname bump in Rawhide. - -* Tue Apr 01 2014 Richard W.M. Jones - 1:24.3-15 -- Rebuild because of unannounced ImageMagick soname bump in Rawhide. - -* Mon Feb 03 2014 Petr Hracek - 1:24.3-14 -- replace sysconfdir/rpm with rpmconfigdir/macros.d - -* Wed Aug 14 2013 Jaromir Koncicky - 1:24.3-13 -- Fix default PDF viewer (#971162) - -* Fri Aug 09 2013 Petr Hracek - 1:24.3-12 -- emacs -mm (maximized) does not work (#985729) - -* Sat Aug 03 2013 Fedora Release Engineering - 1:24.3-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jul 18 2013 Petr Pisar - 1:24.3-10 -- Perl 5.18 rebuild - -* Tue Apr 09 2013 Petr Hracek - 1:24.3-9 -- Help and man page corrections (#948838) - -* Tue Apr 09 2013 Petr Hracek - 1:24.3-8 -- Rebuild with new file package - -* Mon Apr 08 2013 Petr Hracek - 1:24.3-7 -- Spell checking broken by non-default dictionary (#827033) - -* Thu Apr 04 2013 Petr Hracek - 1:24.3-6 -- Rebuild with new ImageMagick - -* Thu Apr 04 2013 Petr Hracek - 1:24.3-5 -- Fix for Gtk-Warning (#929353) - -* Wed Apr 03 2013 Petr Hracek - 1:24.3-4 -- Fix for info page. info.info.gz page was renamed to info.gz (#927996) - -* Thu Mar 28 2013 Petr Hracek - 1:24.3-3 -- Fix for emacs bug 112144, style_changed_cb (#922519) -- Fix for emacs bug 112131, bell does not work (#562719) - -* Mon Mar 18 2013 Petr Hracek - 1:24.3-2 -- fix #927996 correcting bug. Info pages were not delivered - -* Mon Mar 18 2013 Petr Hracek - 1:24.3-1 -- Updated to the newest upstream release -- solved problem with distribution flag in case of rhel -- rcs-checking not availble anymore -- emacs22.png are not installed anymore - -* Mon Mar 18 2013 Rex Dieter 1:24.2-12 -- rebuild (ImageMagick) - -* Fri Mar 08 2013 Ralf Corsépius - 1:24.2-11 -- Remove %%config from %%{_sysconfdir}/rpm/macros.* - (https://fedorahosted.org/fpc/ticket/259). -- Fix broken spec-file changelog entry. - -* Wed Mar 6 2013 Tomáš Mráz - 1:24.2-10 -- Rebuild with new gnutls - -* Mon Jan 21 2013 Jochen Schmitt - 1:24.2-9 -- Fix for emacs bug #13460, ispell-change dictionary hunspell issue (#903151) - -* Fri Jan 18 2013 Adam Tkac - 1:24.2-8 -- rebuild due to "jpeg8-ABI" feature drop - -* Tue Nov 06 2012 Sergio Durigan Junior - 1:24.2-7 -- Fix for Emacs bug #11580, 'Fix querying BBDB for entries without a last - name'. - -* Mon Oct 22 2012 Karel Klíč - 1:24.2-6 -- Change xorg-x11-fonts-misc dependency to dejavu-sans-mono-fonts, rhbz#732422 - -* Thu Sep 20 2012 Karel Klíč - 1:24.2-5 -- Add BSD to emacs-common licenses because of etags. - -* Fri Sep 14 2012 Karel Klíč - 1:24.2-4 -- Moved RPM spec mode to a separate package (rhbz#857865) - -* Fri Sep 14 2012 Karel Klíč - 1:24.2-3 -- Removed patch glibc-open-macro, which seems to be no longer necessary - -* Thu Sep 13 2012 Karel Klíč - 1:24.2-2 -- Removed focus-init.el which used to set focus-follows-mouse to nil. - It is set to nil by default in Emacs 24.2. - -* Thu Sep 13 2012 Karel Klíč - 1:24.2-1 -- Updated to the newest upstream release -- Switched from bz2 upstream package to xz -- Make the spec file usable on EL6 -- Removed the nogets and CVE-2012-3479 patches, because the upstream - package fixes the associated issues -- Added GFDL license to emacs-common package - -* Mon Aug 13 2012 Karel Klíč - 1:24.1-6 -- Fix CVE-2012-3479: Evaluation of 'eval' forms in file-local variable - sections, when 'enable-local-variables' set to ':safe' - -* Wed Jul 18 2012 Fedora Release Engineering - 1:24.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jul 13 2012 Karel Klíč - 1:24.1-4 -- Remove php-mode from the main package. It should be packaged separately. rhbz#751749 - -* Wed Jul 11 2012 Karel Klíč - 1:24.1-3 -- Fix org-mode to work without emacs-el installed. rhbz#830162 -- Fix building without gets function, which is removed from recent version of glibc. - -* Wed Jul 11 2012 Ville Skyttä - 1:24.1-2 -- Build -el, -terminal, and -filesystem as noarch (rhbz#834907). - -* Mon Jun 18 2012 Karel Klíč - 1:24.1-1 -- New upstream release -- Switch from GTK 2 to GTK 3 - -* Fri Jun 8 2012 Karel Klíč - 1:24.1-0.rc1 -- New upstream prerelease -- Cleanup of the %%changelog section - -* Mon May 21 2012 Karel Klíč - 1:24.0.97-1 -- Newest prerelease - -* Fri Apr 6 2012 Karel Klíč - 1:24.0.95-1 -- New upstream prerelease - -* Mon Mar 19 2012 Karel Klíč - 1:24.0.94-3 -- Another rebuild for ImageMagick update - -* Fri Mar 2 2012 Karel Klíč - 1:24.0.94-2 -- Rebuild for ImageMagick update - -* Mon Feb 27 2012 Karel Klíč - 1:24.0.94-1 -- Update to the newest prerelease -- Remove unpatched files in the lisp directory, where all files are - installed - -* Tue Feb 21 2012 Dan Horák - 1:24.0.93-4 -- add upstream fix for emacs bug 10780, revert the workaround - -* Mon Feb 13 2012 Dan Horák - 1:24.0.93-3 -- workaround build failure on ppc and s390 - (http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10780) - -* Wed Feb 8 2012 Kay Sievers - 1:24.0.93-2 -- Drop dependency on 'dev' package; it is gone since many years - -* Mon Feb 6 2012 Karel Klíč - 1:24.0.93-1 -- Update to newer pre-release version - -* Thu Jan 19 2012 Karel Klíč - 1:24.0.92-1 -- Upstream pre-release - -* Thu Jan 12 2012 Karel Klíč - 1:23.3-19 -- Added patch to handle CVE-2012-0035: CEDET global-ede-mode file loading vulnerability (rhbz#773024) - -* Sun Nov 27 2011 Ville Skyttä - 1:23.3-18 -- Apply upstream Subversion >= 1.7 dir structure fix for vc-svn.el. - -* Fri Nov 25 2011 Karel Klíč - 1:23.3-17 -- Add a new command rpm-goto-add-change-log-entry (C-c C-w) to - rpm-spec mode (Jaroslav Skarvada) - -* Fri Nov 25 2011 Karel Klíč - 1:23.3-16 -- Initialize xgselect in function xg_select when - gfds_size == 0 (rhbz#751154) - -* Wed Nov 23 2011 Karel Klíč - 1:23.3-15 -- Check for _NET_WM_STATE_HIDDEN (rhbz#711739) - -* Tue Nov 22 2011 Karel Klíč - 1:23.3-14 -- Build Gtk+ version without gpm - -* Wed Nov 16 2011 Karel Klíč - 1:23.3-13 -- Check the presence of hunspell before checking for aspell (rhbz#713600) - -* Mon Nov 14 2011 Karel Klíč - 1:23.3-12 -- Rebuild (rhbz#751154, rhbz#752936) - -* Sat Oct 22 2011 Ville Skyttä - 1:23.3-11 -- Build with gpm and liblockfile support. -- Drop ssl.el (superseded by tls.el). -- Update php-mode to 1.5.0. - -* Tue Sep 27 2011 Karel Klíč - 1:23.3-10 -- Keep COPYING and NEWS in the etc subdir, and symlinks in the docs (rhbz#714212) - Author: fedora.dm0@gmail.com - -* Tue Sep 27 2011 Karel Klíč - 1:23.3-9 -- Added dependency on xorg-x11-fonts-misc (rhbz#732422) - -* Mon Aug 8 2011 Karel Klíč - 1:23.3-8 -- Updated release archive to 23.3a, which includes grammar files that are - necessary to modify Semantic parsers - -* Thu Jun 30 2011 Ville Skyttä - 1:23.3-7 -- Use custom-set-variables for customizable variables in .emacs (#716440). -- Move frame-title-format default from .emacs to default.el (#716443). - -* Thu May 26 2011 Karel Klíč - 1:23.3-6 -- Enumerate binaries in emacs-common to avoid packaging single binary - multiple times by accident - -* Mon May 23 2011 Karel Klíč - 1:23.3-5 -- Removed %%defattr from %%files sections, as RPM no longer needs it -- Removed %%dir %%{_libexecdir}/emacs and similar from emacs and - emacs-nox packages, as the directories are used and present only in - emacs-common (rhbz#704067) - -* Tue Mar 22 2011 Karel Klic - 1:23.3-4 -- Rebuild to fix an RPM issue (rhbz689182) - -* Tue Mar 15 2011 Ville Skyttä - 1:23.3-3 -- Use UTC timestamps in rpm-spec-mode changelog entries by default (rhbz#672350) -- Consider *.elc in addition to *.el when loading files from site-start.d (rhbz#672324) - -* Tue Mar 15 2011 Karel Klic - 1:23.3-2 -- Another attempt to fix the handling of alternatives (rhbz#684447) - The current process loses alternatives preference on every upgrade, - but there seems to be no elegant way how to prevent this while - having versioned binaries (/bin/emacs-%%{version}) at the same time. -- Removed 'rm -rf %%{buildroot}' from %%install section - -* Thu Mar 10 2011 Karel Klic - 1:23.3-1 -- New upstream release -- Depend on util-linux directly, as the package no longer provides setarch - -* Tue Feb 08 2011 Fedora Release Engineering - 1:23.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 10 2011 Karel Klic - 1:23.2-17 -- Added filesystem subpackage (rhbz#661866) -- Added emacsclient desktop file (rhbz#665362) - -* Fri Jan 7 2011 Karel Klic - 1:23.2-16 -- Removed dependency on both hunspell and aspell. Emacs does not - _require_ spell checker, e.g. if user wants to uninstall one, there - is no reason why Emacs should also be uninstalled. Emacs can run one - like it can run GDB, pychecker, (La)TeX, make, gcc, and all VCSs out - there. -- Removed conflict with old gettext package -- Cleaned spec file header -- Removed gcc-4.5.0 specific CFLAGS - -* Fri Jan 7 2011 Karel Klic - 1:23.2-15 -- The emacs-terminal package now requires emacs package - -* Thu Jan 6 2011 Karel Klic - 1:23.2-14 -- Patch emacs-terminal to use /usr/bin/emacs (rhbz#635213) - -* Mon Sep 6 2010 Karel Klic - 1:23.2-13 -- Removed transient-mark-mode suggestion from dotemacs.el, as this - minor mode is enabled by default in recent versions of Emacs - -* Thu Aug 19 2010 Karel Klic - 1:23.2-12 -- Mention xdg-open in browse-url-default-browser docstring (rhbz#624359) - Updates emacs-23.1-xdg.patch - -* Tue Aug 17 2010 Karel Klic - 1:23.2-11 -- Own /usr/bin/emacs (rhbz#614935) -- Updated the handling of alternatives to match - https://fedoraproject.org/wiki/Packaging:Alternatives - -* Mon Aug 16 2010 Karel Klic - 1:23.2-10 -- Removed the png extension from the Icon entry in emacs.desktop (rhbz#507231) - -* Wed Aug 4 2010 Karel Klic - 1:23.2-9 -- Added Fedora conditionals - -* Mon Aug 2 2010 Karel Klic - 1:23.2-8 -- Moved the terminal desktop menu item to a separate package (rhbz#617355) - -* Thu Jul 8 2010 Karel Klic - 1:23.2-7 -- Added workaround for an GCC 4.5.0 bug - -* Thu Jul 8 2010 Karel Klic - 1:23.2-6 -- Removed Obsoletes: emacs-nxml-mode, it was obsoleted in F-11 -- Added COPYING to emacs-el, moved COPYING in emacs-common to %%doc - -* Thu Jun 3 2010 Karel Klic - 1:23.2-5 -- Fixed handling of dual spacing fonts rhbz#599437 - -* Thu May 27 2010 Karel Klíč - 1:23.2-4 -- Add patch to fix rhbz#595546 hideshow library matches wrong parenthesis - under certain circumstances -- Removed %%clean section - -* Wed May 19 2010 Naveen Kumar - 1:23.2-3 -- Added a desktop file for adding terminal mode to menu (RHBZ #551949) - -* Tue May 11 2010 Karel Klic - 1:23.2-2 -- Added a patch fixing m17n and libotf version checking (m17ncheck) - -* Mon May 10 2010 Karel Klic - 1:23.2-1 -- Updated the prerelase to final version - -* Sun Apr 25 2010 Jonathan G. Underwood - 1:23.1.96-3 -- Add BuildRequires for GConf2-devel to build in Gconf2 support (RHBZ #585447) - -* Sun Apr 25 2010 Jonathan G. Underwood - 1:23.1.96-2 -- Remove po-mode files since they are now packaged separately as a sub-package - of gettext (RHBZ #579452) - -* Tue Apr 20 2010 Karel Klic - 1:23.1.96-1 -- Updated to the newest prerelease -- Remove -movemail patch as it has been merged by upstream - -* Thu Apr 1 2010 Jonathan G. Underwood - 1:23.1.94-6 -- Add patch to fix RHBZ #578272 - security vulnerability with movemail - (CVE-2010-0825) - -* Tue Mar 30 2010 Jonathan G. Underwood - 1:23.1.94-5 -- Fix typo in spec file changelog -- Use standard %%patch macro to apply all patches to silent rpmlint warnings - -* Tue Mar 30 2010 Jonathan G. Underwood - 1:23.1.94-4 -- Remove unnecessary buildroot tag -- Remove explicit dependency on librsvg2 (but keep BuildRequires for - librsvg2-devel) -- Add properly versioned Provides for emacs(bin) -- Remove long unneeded Obsoletes for emacs-leim -- Fix summary for emacs-el - -* Tue Mar 30 2010 Jonathan G. Underwood - 1:23.1.94-3 -- Use out of tree builds so that we can build multibple versions in the - %%build section - -* Tue Mar 23 2010 Jonathan G. Underwood - 1:23.1.94-2 -- Remove checks for old version of Emacs in postrtrans - -* Mon Mar 22 2010 Karel Klic - 1:23.1.94-1 -- Update to 23.2 pretest version -- Removed patches applied by upstream - -* Fri Mar 19 2010 Jonathan G. Underwood - 1:23.1-26 -- Fix broken byte compilation of emacs2.py and emacs3.py with the relevant - python binaries - requires turning off brp-python-bytecompile script - -* Mon Mar 15 2010 Jonathan G. Underwood - 1:23.1-25 -- Add --eval '(progn (setq load-path (cons "." load-path)))' to byte - compilation macro for packaging add-ons - -* Tue Feb 9 2010 Karel Klic 1:23.1-24 -- Added a comment about alternatives(8) in %%posttrans to the spec file - -* Thu Jan 14 2010 Jonathan G. Underwood 1:23.1-23 -- Add patch to fix rhbz#547566 (from Juanma Barranquero) - -* Tue Jan 12 2010 Karel Klic 1:23.1-22 -- Removed invalid URL for rpm-spec-mode.el. This mode is no longer - found on Internet in this version. - -* Thu Jan 7 2010 Karel Klic 1:23.1-21 -- Removed PreReq from spec file - -* Thu Jan 7 2010 Karel Klic 1:23.1-20 -- Simpler fix for rhbz#517272 - -* Thu Jan 7 2010 Jens Petersen - 1:23.1-19 -- m17n-lib-flt requires m17n-db-flt so no longer need to require explicitly - m17n-db-datafiles for complex text rendering (#542657) - -* Mon Jan 4 2010 Karel Klic 1:23.1-18 -- Fixed rhbz#517272 - emacs-23.1 update shows fonts in double the normal size - -* Tue Dec 8 2009 Karel Klic 1:23.1-17 -- Fixed rhbz#545398 - ETags messes up filenames - -* Thu Dec 03 2009 Daniel Novotny 1:23.1-16 -- fix #542657 - emacs does not display indic text - -* Wed Dec 02 2009 Daniel Novotny 1:23.1-15 -- fix #543046 - Using scroll bar in emacs highlights/selects text - -* Mon Nov 30 2009 Daniel Novotny 1:23.1-14 -- fixed FTBFS in F12 and higher (#540921) - -* Mon Oct 19 2009 Daniel Novotny 1:23.1-13 -- fixed update-directory-autoloads (#474958) - -* Wed Oct 14 2009 Daniel Novotny 1:23.1-12 -- do not compress the files which implement compression itself (#484830) - -* Wed Oct 14 2009 Jonathan G. Underwood - 1:23.1-11 -- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package -- Use site_start_d macro consistently - -* Tue Sep 29 2009 Daniel Novotny 1:23.1-10 -- emacs contains nxml-mode (#516391) - -* Thu Sep 24 2009 Daniel Novotny 1:23.1-9 -- use xdg-open(1) for opening URLs (#316131) - -* Wed Sep 23 2009 Daniel Novotny 1:23.1-8 -- updated rpm-spec-mode.el to latest upstream version (#524851) - -* Tue Sep 22 2009 Daniel Novotny 1:23.1-7 -- updated %%info_files (#510750) - -* Mon Aug 31 2009 Daniel Novotny 1:23.1-6 -- fixed buffer menu (#515722) - -* Wed Aug 26 2009 Daniel Novotny 1:23.1-5 -- correct BuildRequires for libotf (#519151) - -* Tue Aug 25 2009 Daniel Novotny 1:23.1-4 -- alsa-lib-devel added to BuildRequires (#518659) - -* Thu Aug 13 2009 Daniel Novotny 1:23.1-3 -- fixed Name and GenericName in desktop file (#514599) - -* Mon Aug 10 2009 Ville Skyttä - 1:23.1-2 -- Use bzipped upstream tarball. - -* Fri Jul 31 2009 Daniel Novotny 1:23.1-1 -- new upstream version 23.1 - -* Fri Jul 24 2009 Fedora Release Engineering - 1:23.0.93-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Jun 26 2009 Daniel Novotny 1:23.0.93-6 -- removed dependency to bitmap fonts: emacs version 23 does not need them - -* Thu Jun 25 2009 Daniel Novotny 1:23.0.93-5 -- revoked default.el change (#508033) -- added build dependency: librsvg2-devel (#507852) -- added dependency: aspell (#443549) - -* Wed Jun 24 2009 Daniel Novotny 1:23.0.93-4 -- added xorg-x11-fonts-misc to dependencies (#469220) - -* Fri Jun 19 2009 Jens Petersen - 1:23.0.93-3 -- drop igrep since lgrep and rgrep are maintained in emacs now -- specify the list of *-init.el files to be install explicitly - -* Thu Jun 11 2009 Daniel Novotny 1:23.0.93-2 -- fix bz#505083 - rpm-add-change-log-entry date format rejected by rpmbuild - -* Mon May 18 2009 Daniel Novotny 1:23.0.93-1 -- new upstream version - -* Fri Apr 10 2009 Daniel Novotny 1:22.3-11 -- fix bz#443549 - spell-buffer, flyspell-mode do not work - -* Fri Mar 27 2009 Daniel Novotny 1:22.3-10 -- fix segfaults when emacsclient connects to a tcp emacs server (#489066) - -* Thu Mar 12 2009 Daniel Novotny 1:22.3-9 -- implement UTC change log option in rpm-spec-mode.el (#489829) - -* Wed Mar 4 2009 Michel Salim - 1:22.3-8 -- Use desktop-file-utils to handle desktop file -- Update icon cache if GTK2 is installed - -* Wed Feb 25 2009 Daniel Novotny 1:22.3-7 -- site-lisp/default.el is now config(noreplace) - -* Tue Feb 24 2009 Fedora Release Engineering - 1:22.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Feb 16 2009 Daniel Novotny 1:22.3-5 -- fix #474578 - /usr/bin/emacs link not updated on upgrade - (added a script to scan the alternatives and update them) - -* Mon Feb 09 2009 Daniel Novotny 1:22.3-4 -- fix bz#484309 (alternatives error message) - -* Sun Jan 18 2009 Jonathan G. Underwood - 1:22.3-3 -- Add /etc/rpm/macros.emacs file - -* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 1:22.3-2 -- Rebuild for Python 2.6 - -* Sat Nov 8 2008 Jens Petersen - 1:22.3-1 -- update to 22.3 (#461448) -- emacs-22.1.50-sparc64.patch and emacs-22.1.50-regex.patch no longer needed -- update rpm-spec-mode.el to look for fields at bol (#466407) - -* Thu May 01 2008 Tom "spot" Callaway -- fix requires to include epoch - -* Thu May 01 2008 Dennis Gilmore 1:22.2-4 -- add patch from bz#435767 - -* Thu May 01 2008 Dennis Gilmore 1:22.2-3 -- add epoch -- put epoch in .pc file - -* Thu Apr 24 2008 Dennis Gilmore 22.2-2 -- add patch fixing libdir on sparc64 - -* Tue Apr 22 2008 Chip Coldwell 22.2-1 -- revert back to emacs-22.2 (bz443639) -- update to php-mode-1.4.0 -- update to rpm-spec-mode.el v0.12.1x (bz432209) -- patch rpm-spec-mode to use compilation mode (bz227418) -- fix the Release tag (bz440624) -- drop superfluous configure options -- move the new icons into the right destination directory -- the heuristics for detecting address space randomization in the emacs dumper - seem insufficient, so bring back setarch -R - -* Fri Apr 18 2008 Chip Coldwell 23.0.60-2 -- New upstream tarball (fixes bz435767) -- configure tweaks -- drop files.el patch (now upstream) -- drop parallel build patch (now upstream) - -* Mon Feb 18 2008 Fedora Release Engineering - 22.1.50-4 -- Autorebuild for GCC 4.3 - -* Wed Jan 2 2008 Chip Coldwell 22.1.50-3.1 -- parallel build patch from Dan Nicolaescu - -* Fri Dec 7 2007 Chip Coldwell 22.1.50-3 -- scriptlets shouldn't fail needlessly. -- new upstream tarball - -* Thu Dec 6 2007 Chip Coldwell 22.1.50-2 -- drop -DSYSTEM_PURESIZE_EXTRA=16777216 (bz409581) - -* Mon Nov 19 2007 Chip Coldwell 22.1.50-1 -- pulled sources from GNU CVS - -* Mon Nov 19 2007 Chip Coldwell 22.1-9 -- fixup alternatives mess (bz239745, bz246540) - -* Tue Nov 6 2007 Chip Coldwell 22.1-8 -- fix insufficient safe-mode checks (Resolves: bz367601) - -* Thu Nov 1 2007 Chip Coldwell 22.1-7 -- Update rpm-spec-mode to the current upstream, drop compat patch (bz306841) - -* Wed Oct 24 2007 Jeremy Katz - 22.1-6 -- Update rpm-spec-mode to the current upstream (#306841) - -* Wed Sep 12 2007 Chip Coldwell - 22.1-5 -- require xorg-x11-fonts-ISO8859-1-100dpi instead of 75dpi (Resolves: bz281861) -- drop broken python mode (Resolves: bz262801) - -* Mon Sep 10 2007 Chip Coldwell - 22.1-4 -- fix pkgconfig path (from pkg-config to pkgconfig (Jonathan Underwood) -- use macro instead of variable style for buildroot. - -* Tue Aug 28 2007 Chip Coldwell - 22.1-3 -- change group from Development to Utility - -* Mon Aug 13 2007 Chip Coldwell - 22.1-2 -- add pkgconfig file for emacs-common and virtual provides (Resolves: bz242176) -- glibc-open-macro.patch to deal with glibc turning "open" into a macro. -- leave emacs info pages in default section (Resolves: bz199008) - -* Wed Jun 6 2007 Chip Coldwell - 22.1-1 -- move alternatives install to posttrans scriptlet (Resolves: bz239745) -- new release tarball from FSF (Resolves: bz245303) -- new php-mode 1.2.0 - -* Wed May 23 2007 Chip Coldwell - 22.0.990-2 -- revert all spec file changes since 22.0.95-1 (Resolves: bz239745) -- new pretest tarball from FSF (Resolves: bz238234) -- restore php-mode (Resolves: bz235941) - -* Mon May 21 2007 Chip Coldwell - 22.0.990-1 -- new pretest tarball from FSF -- removed Ulrich Drepper's patch to prevent mmapped pages during dumping - removed BuildRequires: glibc >= 2.5.90-22 - (bug traced to glibc Resolves: bz239344) -- fix alternatives removal scriptlet (Resolves: bz239745) - -* Thu May 17 2007 Chip Coldwell - 22.0.99-4 -- format of freed blocks changed between glibc 2.5.90-21 and 2.5.90-22 -- BuildRequires: glibc >= 2.5.90-22 (Ulrich Drepper) - -* Sun May 13 2007 Chip Coldwell - 22.0.99-2 -- prevent mmapped pages during dumping (Ulrich Drepper Resolves: bz239344) - -* Tue Apr 24 2007 Chip Coldwell - 22.0.99-1 -- new (last?) pretest tarball from FSF -- update to php-mode-1.2.0 (Ville Skyttä Resolves: bz235941) -- use /etc/alternatives instead of wrapper script - -* Tue Mar 6 2007 Chip Coldwell - 22.0.95-1 -- new pretest tarball from FSF - -* Mon Feb 26 2007 Chip Coldwell - 22.0.94-1 -- new pretest tarball obsoletes loaddefs.el dependencies patch - -* Fri Feb 23 2007 Chip Coldwell - 22.0.93-7 -- fix po-mode-init.el (Kjartan Maraas #228143) - -* Tue Feb 13 2007 Chip Coldwell - 22.0.93-6 -- remove --without-xim configure flag to fix dead keys (Alexandre Oliva #224626) - -* Fri Jan 26 2007 Chip Coldwell - 22.0.93-5 -- remove Tetris to avoid trademark problems (Ville Skyttä #224627) - -* Thu Jan 25 2007 Chip Coldwell - 22.0.93-4 -- fixup loaddefs.el dependencies (Dan Nicolaescu #176171) -- add BuildRequires: automake (changes to Makefile.in) - -* Wed Jan 24 2007 Chip Coldwell - 22.0.93-3 -- po-mode.el was being left out - -* Tue Jan 23 2007 Chip Coldwell - 22.0.93-1 -- new pretest version -- removed setarch since new dumper copes with execshield -- clean up site initialization files (varions #176171) - -* Tue Jan 2 2007 Chip Coldwell - 22.0.92-1 -- new pretest version -- removed almost all emacs 21 patches from emacs 22 -- clean up spec file, -- many new BuildRequires (David Woodhouse #221250) - -* Tue Nov 14 2006 Chip Coldwell - 22.0.90-1 -- first pretest rpm build - -* Mon Nov 6 2006 Chip Coldwell - 21.4-19 -- BuildRequires: sendmail (Wolfgang Rupprecht #213813) - -* Thu Aug 3 2006 Chip Coldwell - 21.4-18 -- non-CJK text broken by default for Western locale (James Ralston #144707) - -* Thu Aug 3 2006 Chip Coldwell - 21.4-17 -- use UTF-8 keyboard input encoding on terminals that support it (Axel Thimm #185399) - -* Thu Aug 3 2006 Chip Coldwell - 21.4-16 -- fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737) - -* Wed Jul 26 2006 Chip Coldwell - 21.4-15 -- fix src/unexelf.c to build on PowerPC64 (backport from emacs-22, #183304) - -* Wed Jul 12 2006 Jesse Keating - 21.4-14.1.1 -- rebuild - -* Tue Apr 18 2006 Chip Coldwell - 21.4-14.1 -- don't clobber site-lisp/default.el (Ritesh Khadgaray, 180153) - -* Tue Mar 7 2006 Jens Petersen - 21.4-14 -- bring back setarch for i386 with -R option in spec file and drop - emacs-21-personality-linux32-101818.patch since it no longer seems - sufficient with recent kernels (Sam Peterson, #174736) -- buildrequire giflib-devel instead of libungif-devel - -* Thu Mar 2 2006 Jens Petersen -- avoid backup for fix-x-vs-no-x-diffs.dpatch (Ian Collier, #183503) -- remove the old ccmode info manual (#182084) - -* Mon Feb 27 2006 Jens Petersen - 21.4-13 -- buildrequire libXaw-devel for menus and scrollbar -- pass -R to setarch to disable address randomization during dumping - (Sam Peterson, #174736) -- install cc-mode.info correctly (Sam Peterson, #182084) -- fix sort-columns not to use deprecated non-posix sort key syntax - with sort-columns-posix-key-182282.patch (Richard Ryniker, #182282) -- use system-name function not variable when setting frame-title-format in - /etc/skel/.emacs for XEmacs users hitting .emacs - -* Fri Feb 10 2006 Jesse Keating - 21.4-12.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 21.4-12.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Feb 3 2006 Jens Petersen - 21.4-12 -- add mule-cmd.el-X11-locale.alias-173781.patch to correct location of X11 - locale.alias file (Paul Dickson, #173781) -- fix autoload of php-mode in php-mode-init.el (Christopher Beland, #179484) - -* Wed Dec 14 2005 Jens Petersen - 21.4-11 -- avoid building with -fstack-protector on i386 to prevent crashing - (Jonathan Kamens, #174730) -- require xorg-x11-fonts-ISO8859-1-75dpi instead of xorg-x11-fonts-75dpi - for modular X (#174614) - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Fri Nov 25 2005 Jens Petersen - 21.4-10 -- fix missing parenthesis in lang-coding-systems-init.el - -* Tue Nov 22 2005 Jens Petersen - 21.4-9 -- fix keyboard-coding-system on console for utf-8 (Dawid Gajownik, #173855) -- update etags to latest cvs (Hideki Iwamoto, #173023) - - replace etags-14.21-17.11-diff.patch with etags-update-to-cvs.patch -- update smtpmail.el to latest cvs version for better authentication support - with smtpmail-cvs-update.patch (Alberto Brizio, #167804) - -* Mon Nov 14 2005 Jeremy Katz - 21.4-8 -- update dep for new xorg fonts packages - -* Wed Aug 24 2005 Jens Petersen -- fix name of aspell-es dictionary (#147964) - - update emacs-21.3-lisp-textmodes-ispell-languages.patch - -* Thu Jul 14 2005 Jens Petersen - 21.4-7 -- update rpm-spec-mode.el to cvs revision 1.17 (Ville Skyttä) - - fixes expansion of %%{?dist} -- replace emacs-21.4-setarch_for_loadup-101818.patch with backport - emacs-21-personality-linux32-101818.patch from cvs (Jan Djärv) - which also turns off address randomization during dumping (Masatake Yamato) - - no longer need to pass SETARCH to make on i386 (#160814) -- move ownership of %%{_datadir}/emacs/ and %%{_datadir}/emacs/%%{version}/ - from emacs to emacs-el and emacs-leim subpackages -- don't build tramp html and dvi documentation -- drop src/config.in part of bzero-and-have-stdlib.dpatch to avoid - compiler warnings - -* Thu Jun 23 2005 Jens Petersen - 21.4-6 -- merge in changes from emacs22.spec conditionally - - define emacs21 rpm macro switch to control major version and use it -- update tramp to 2.0.49 - -* Fri Jun 17 2005 Jens Petersen -- set arg0 to emacs in wrapper script (Peter Oliver, 149512#3) - -* Mon May 30 2005 Jens Petersen -- move setting of require-final-newline from default.el to a comment in default - .emacs (Ralph Loader, 119141) - -* Wed May 18 2005 Jens Petersen - 21.4-5 -- update cc-mode to 5.30.9 stable release to address font-lock problems - (126165,148977,150197,155292,158044) - -* Mon May 16 2005 Jens Petersen - 21.4-4 -- don't accidently exclude emacsclient from common package - (Jonathan Kamens, #157808) -- traditional Chinese desktop file translation (Wei-Lun Chao, #157287) - -* Wed Apr 20 2005 Jens Petersen - 21.4-3 -- add igrep.el and init file - -* Mon Apr 11 2005 Jens Petersen - 21.4-2 -- update etags to 17.11 (idht4n@hotmail.com, 151390) - - add etags-14.21-17.11-diff.patch -- replace i386 setarch redefinitions of __make and makeinstall with - emacs-21.4-setarch_for_loadup-101818.patch and setting SETARCH on i386 - (Jason Vas Dias, 101818) - -* Sun Apr 10 2005 Jens Petersen - 21.4-1 -- update to 21.4 movemail vulnerability release - - no longer need movemail-CAN-2005-0100.patch -- replace %%{_bindir}/emacs alternatives with a wrapper script (Warren Togami) - to prevent it from disappearing when upgrading (Michal Jaegermann, 154326) - - suffix the X emacs binaries with -x and the no X binaries with -nox - - the wrapper script %%{_bindir}/emacs-%%version runs emacs-x if installed or - otherwise emacs-nox. %%{_bindir}/emacs is a symlink to the wrapper -- make emacs and emacs-nox own the subdirs in %%{_libexecdir} -- add a bunch of fixes from debian's emacs21_21.4a-1 patch: - battery-acpi-support.dpatch, bzero-and-have-stdlib.dpatch, - coding-region-leak.dpatch, detect-coding-iso2022.dpatch, - fix-batch-mode-signal-handling.dpatch, pcl-cvs-format.dpatch, - python-completion-ignored-extensions.dpatch, - remote-files-permissions.dpatch, save-buffer.dpatch, scroll-margin.dpatch, - xfree86-4.3-modifiers.dpatch - - add fix-x-vs-no-x-diffs.dpatch - - define emacs_libexecdir - - build both emacs and emacs-nox as %%{version}.1 and move common DOC file - to emacs-common - - suffix version in fns-%%{version}.1.el with -x and -nox respectively -- add 100 to elisp patches - -* Wed Apr 6 2005 Jens Petersen - 22.0.50-0.20050406 -- update to snapshot of current cvs - - configure xim support off by default - - bootstrap snapshot - -* Wed Apr 6 2005 Jens Petersen - 21.3-27 -- use alternatives to switch _bindir/emacs between emacs and emacs-nox - (Henning Schmiedehausen, #151067) - - remove emacs and emacs-nox from bindir - - prereq alternatives for emacs and emacs-nox - - add post and postun scripts to handle alternatives -- buildrequire xorg-x11-devel instead of XFree86-devel -- really include and apply emacs-21.3-latex-mode-hook-144083.patch -- make emacs and emacs-nox own _datadir/emacs/version too - -* Wed Mar 9 2005 Jens Petersen - 21.3-26 -- rebuild with gcc 4.0 - - add emacs-21.3-gcc4.patch for emacsclient - -* Mon Feb 28 2005 Jens Petersen - 21.3-25 -- add tramp-2.1.3 to site-lisp (David Woodhouse, 149703) - - move removal of info dir to after its installation - - add tramp-init.el to put tramp into load-path - -* Thu Feb 24 2005 Jens Petersen - 21.3-24 -- mark default.el as a noreplace config file (Pawel Salek, 149310) -- only set keyboard-coding-system in xterms to fix problem with input - Latin characters becoming prefixes and making emacs loop - (Eddahbi Karim, 126007) -- make emacs-el own its lisp directories -- run latex-mode-hook in latex-mode (Martin Biely, 144083) - - add emacs-21.3-latex-mode-hook-144083.patch - -* Fri Feb 18 2005 Jens Petersen - 21.3-23 -- install %%{_bindir}/emacs-nox as a hardlink of the versioned binary -- drop explicit lib requirements -- use sed instead of perl to fix up filelists - -* Mon Feb 14 2005 Jens Petersen - 21.3-22 -- use prereq instead of contexts for common script requirements - (Axel Thimm, 147791) -- move emacs.png from common to main package - -* Fri Feb 4 2005 Jens Petersen - 21.3-21 -- fix CAN-2005-0100 movemail vulnerability with movemail-CAN-2005-0100.patch - (Max Vozeler, 146701) - -* Fri Jan 14 2005 Jens Petersen - 21.3-20 -- workaround xorg-x11 modifier key problem with - emacs-21.3-xterm-modifiers-137868.patch (Thomas Woerner, 137868) - -* Mon Nov 29 2004 Jens Petersen - 21.3-19 -- prefer XIM status under-the-window for now to stop xft httx from dying - (125413): add emacs-xim-status-under-window-125413.patch -- default diff to unified format in .emacs - -* Wed Nov 10 2004 Jens Petersen - 21.3.50-0.20041111 -- initial packaging of cvs emacs - - leim and elisp manual now in main tarball - - no leim subpackage anymore, so make common obsolete it - - no longer need MuleUCS, nor rfc1345.el - - buildrequire and use autoconf rather autoconf213 - - no longer need emacs-21.2-x86_64.patch, - editfns.c-Fformat-multibyte-davej.patch - - bring back game for now - - TODO: some patches still need updating - - fns.el no longer installed - - remove /var/games for now - - update filelist generation to single sweep - - update info_files list - -* Thu Nov 4 2004 Jens Petersen - 21.3-18 -- show emacs again in the desktop menu (132567) -- require fonts-xorg-75dpi to prevent empty boxes at startup due to missing - fonts (Johannes Kaiser, 137060) - -* Mon Oct 18 2004 Jens Petersen - 21.3-17 -- fix etag alternatives removal when uninstalling (Karsten Hopp, 136137) - -* Fri Oct 15 2004 Jens Petersen - 21.3-16 -- do not setup frame-title-format in default.el, since it will override - setting by users (Henrik Bakken, 134520) -- emacs-el no longer requires emacs for the sake of -nox users - (Lars Hupfeldt Nielsen, 134479) -- condition calling of global-font-lock-mode in default .emacs - in case xemacs should happen to load it - -* Wed Sep 29 2004 Jens Petersen - 21.3-15 -- cleanup and update .desktop file -- make emacs not appear in the desktop menu (Seth Nickell,132567) -- move the desktop file from -common to main package -- go back to using just gctags for ctags -- etags is now handled by alternatives (92256) -- improve the default frame title by prefixing the buffer name - (Christopher Beland, 128110) -- fix the names of some European aspell languages with - emacs-21.3-lisp-textmodes-ispell-languages.patch (David Jansen, 122618) -- fixing running "libtool gdb program" in gud with - emacs-21.3-gud-libtool-fix.patch (Dave Malcolm, 130955) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Fri Apr 30 2004 Jens Petersen - 21.3-13 -- unset focus-follows-mouse in default.el to make switching frames work for - click-to-focus (Theodore Belding,114736) - -* Thu Apr 15 2004 Jens Petersen - 21.3-12 -- update php-mode to 1.1.0 -- add emacs-21.3-no-rpath.patch so that /usr/X11R6/lib is not rpath'ed -- require /bin/ln for %%post (Tim Waugh, 119817) -- move prereq for dev and /sbin/install-info to emacs-common -- leim no longer requires emacs -- use source site-lisp dir in %%prep to setup site files -- define and use site_lisp for buildroot in %%install -- default ispell dictionary to "english" for CJK locale -- add comment to top of site-start.el about load order -- turn on auto-compression-mode in default.el (114808) -- set require-final-newline with setq (David Olsson,119141) - and remove redundant next-line-add-newlines setting -- update info_file list (Reuben Thomas,114729) - -* Tue Mar 16 2004 Mike A. Harris 21.3-11 -- Removed bogus Requires: XFree86-libs that was added in 21.3-8, as rpm - find-requires will automatically pick up the dependancies on any runtime - libraries, and such hard coded requires is not X11 implementation - agnostic (#118471) - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Sat Jan 24 2004 Jens Petersen - 21.3-9 -- bring back emacs-nox subpackage (emacs built without X support) (#113001) - [suggested by Frank Kruchio] -- base emacs package now only contains emacs binary built with X support - and no longer obsoletes emacs-nox -- all the common files required by emacs and emacs-nox are now in emacs-common -- update php-mode.el to 1.0.5 -- add missing rfc1345.el leim input method -- update po-compat.el to version in gettext-0.13.1 -- update base package summary -- add url for python-mode.el and php-mode.el -- gctags is now a symlink to ctags.emacs - -* Wed Jan 14 2004 Jens Petersen - 21.3-8 -- comment out setting transient-mark-mode in skel .emacs (#102441,#90193) - [reported by mal@gromco.com, Jonathan Kamens] -- improve lang-coding-systems-init.el to set-language-environment for CJK - utf-8 locale too and use utf-8 for default-coding-systems and - terminal-coding-system (#111172) [Yoshinori Kuniga] -- update rpm-spec-mode.el to newer one in xemacs package cvs (#105888) [Dams] -- rename etags to etags.emacs and make etags a symlink to it at install time - if it doesn't exist (#92256) [marc_soft@merlins.org] -- apply editfns.c-Fformat-multibyte-davej.patch to fix multibyte code typo - in Fformat [patch from Dave Jones] -- add runtime requirements for XFree86-libs, image libraries, ncurses and zlib -- improve -el and -leim package summaries -- no longer configure build with redundant --with-gcc - -* Tue Nov 25 2003 Jens Petersen -- buildrequire autoconf213 (#110741) [reported by mvd@mylinux.com.ua] - -* Mon Oct 27 2003 Jens Petersen - 21.3-7 -- use "setarch i386" to build on ix86 (#101818) [reported by Michael Redinger] -- use __make to %%build and %%install -- set keyboard coding-system for utf-8 in lang-coding-systems-init.el (#106929) - [reported with fix by Axel Thimm] -- add source url for MuleUCS -- update base package description (#103551) [reported by Tim Landscheidt] - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed May 7 2003 Jens Petersen - 21.3-5 -- move transient-mark-mode and global-font-lock-mode setting from default.el - back to dotemacs, so as not to surprise old users (#90193) - [reported by jik@kamens.brookline.ma.us] -- change require-final-newline to query (default.el) -- don't make a backup when applying browse-url-htmlview-84262.patch (#90226) - [reported by mitr@volny.cz] - -* Fri May 2 2003 Elliot Lee -- Add emacs-21.3-ppc64.patch - -* Fri Apr 25 2003 Jens Petersen - 21.3-3 -- use Mule-UCS utf-8 coding-system for CJK subprocess IO -- no need to set fontset anymore in CJK locale - -* Wed Apr 16 2003 Jens Petersen - 21.3-2 -- add Mule-UCS for CJK utf-8 support (suggested by Akira Tagoh) - and use it by default in CJK UTF-8 locale -- move emacs-asian startup files into new lang-coding-systems-init.el -- utf-8 setup in site-start.el is no longer needed in Emacs 21.3 -- generate filelist for site-lisp automatically like base lisp and leim -- don't setup aspell in site-start.el -- rename dotemacs to dotemacs.el and move former contents to new default.el - -* Mon Apr 7 2003 Jens Petersen - 21.3-1 -- update to 21.3 -- no longer set compound-text-with-extensions in dotemacs, since it is now - the default -- emacs-21.2-pop.patch is no longer needed -- update php-mode to 1.0.4 - -* Thu Feb 20 2003 Jens Petersen - 21.2-33 -- default browse-url to use htmlview (#84262) -- remove info dir file rather than excluding it - -* Sat Feb 8 2003 Jens Petersen - 21.2-32 -- set X copy'n'paste encoding to extended compound-text (#74100) - by default in .emacs file [suggested by olonho@hotmail.com] -- .emacs file cleanup (xemacs now has a separate init file) - -* Fri Feb 7 2003 Jens Petersen - 21.2-31 -- block input in allocate_vectorlike to prevent malloc hangs (#83600) - [thanks to Jim Blandy] -- set startup wmclass notify in desktop file - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Wed Jan 15 2003 Jens Petersen 21.2-29 -- update to newer po-mode.el and po-compat.el from gettext-0.11.4 -- patch po-mode's po-replace-revision-date for when - po-auto-replace-revision-date is nil (#71264) -- update po-mode-init.el -- examine LC_ALL before LC_CTYPE in site-start.el for utf-8 (#79535) -- don't install etc/DOC files explicitly by hand -- make sure all lisp .elc files are up to date -- pass _smp_mflags to make -- remove games that we shouldn't ship - -* Mon Jan 13 2003 Karsten Hopp 21.2-28 -- s390x lib64 fix - -* Fri Jan 3 2003 Jens Petersen 21.2-27 -- look at LANG after LC_CTYPE when checking for UTF-8 locale encoding - in site-start.el (#79535) -- don't set desktop file config(noreplace) - -* Fri Dec 20 2002 Jens Petersen 21.2-26 -- unset the sticky bit of emacs in bindir (#80049) - -* Wed Dec 18 2002 Jens Petersen 21.2-25 -- no need to patch config.{sub,guess} - -* Tue Dec 3 2002 Tim Waugh -- Fix python-mode-init.el (bug #78910). - -* Sun Dec 1 2002 Jens Petersen 21.2-24 -- rpm-spec-mode update fixes - - patch in XEmacs compat functions rather than defining them with apel - macros in init file (#78764) - - autoload "rpm-spec-mode" not "rpm-spec-mode.el" in same file -- let emacs base also own leim dir to avoid startup warning about missing dir - when -el and -leim aren't installed (#78764) - -* Thu Nov 28 2002 Jens Petersen -- use LC_CTYPE rather than LANG to determine default encoding (#78678) - [reported by starback@stp.ling.uu.se] - -* Wed Nov 27 2002 Jens Petersen 21.2-23 -- set transient-mark-mode in dotemacs for Emacs not XEmacs (#75440) -- update rpm-spec-mode.el to 0.12 - - define needed XEmacs compat functions in new rpm-spec-mode-init.el -- tidy site-start.el - - move python-mode setup to python-mode -- don't build with sbin in path -- use _libexecdir, _bindir and _sysconfdir -- don't gzip info files explicitly -- use tar's C and j options -- generate lisp file-lists in single find sweeps over lisp and leim dirs - - use -fprint and -fprintf - - correct more dir ownerships - -* Sun Nov 24 2002 Florian La Roche 21.2-22 -- add correct alloca defines for s390 - -* Wed Nov 6 2002 Jens Petersen 21.2-21 -- uses patches for x86_64 and s390 support and config.{guess,sub} updating - -* Tue Nov 5 2002 Jens Petersen 21.2-20 -- add support for x86_64 and merge in s390 support from cvs -- add alloca defines to amdx86-64.h (from SuSE) - -* Wed Oct 30 2002 Jens Petersen 21.2-19 -- own our libexec dir (#73984) -- only set transient-mark-mode in dotemacs for Emacs (#75440) -- update to latest config.{guess,sub} -- use _datadir macro - -* Wed Aug 28 2002 Trond Eivind Glomsrød 21.2-18 -- Desktop file fix - add Application to make it show up -- DNS lookup fix for pop (#64802) - -* Tue Aug 27 2002 Trond Eivind Glomsrød 21.2-17 -- Fix gdb arrow when used in non-windowed mode (#56890) - -* Fri Aug 9 2002 Trond Eivind Glomsrød 21.2-16 -- Handle UTF-8 input (#70855). - -* Tue Aug 6 2002 Trond Eivind Glomsrød 21.2-15 -- Don't use canna by default (#70870) - -* Thu Aug 1 2002 Trond Eivind Glomsrød 21.2-14 -- Fixes to desktop file (add encoding, add missing a ";") -- Update s390 patch - -* Wed Jul 24 2002 Trond Eivind Glomsrød 21.2-13 -- rpm -> rpmbuild for rpmspec mode (#68185) - -* Mon Jul 22 2002 Trond Eivind Glomsrød 21.2-12 -- desktop file changes (#69385) - -* Mon Jul 8 2002 Trond Eivind Glomsrød 21.2-11 -- Fix php-mode to not initialize on e.g. foophp.c (#67592) - -* Thu Jun 27 2002 Trond Eivind Glomsrød 21.2-10 -- Downgrade po-mode - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Mon Jun 17 2002 Trond Eivind Glomsrød 21.2-8 -- #66808 - -* Wed May 29 2002 Trond Eivind Glomsrød 21.2-7 -- Rebuild - -* Mon May 20 2002 Trond Eivind Glomsrød 21.2-6 -- Prereq dev - -* Thu May 16 2002 Trond Eivind Glomsrød 21.2-5 -- Update the elisp manual and po-mode - -* Tue May 7 2002 Trond Eivind Glomsrød 21.2-4 -- php-mode 1.0.2 - -* Thu Apr 25 2002 Trond Eivind Glomsrød 21.2-3 -- Update po-mode to the one from gettext 0.11.1 - -* Mon Apr 8 2002 Trond Eivind Glomsrød 21.2-2 -- Tweak mouse init process (#59757) - -* Mon Mar 18 2002 Trond Eivind Glomsrød 21.2-1 -- 21.2 - -* Fri Mar 8 2002 Trond Eivind Glomsrød 21.1.95-1 -- 21.1.95 - -* Fri Feb 8 2002 Trond Eivind Glomsrød 21.1.90-2 -- Upgrade po-mode to the version bundled with gettext 0.11 -- Upgrade rpm-spec-mode to 0.11h - -* Thu Jan 31 2002 Trond Eivind Glomsrød 21.1.90-1 -- 21.1.90 - -* Fri Jan 18 2002 Trond Eivind Glomsrød 21.1.80-2 -- Add ebrowse -- Set transient-mode to t in /etc/skel/.emacs - -* Mon Jan 14 2002 Trond Eivind Glomsrød 21.1.80-1 -- 21.1.80 - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Thu Dec 6 2001 Trond Eivind Glomsrød 21.1-3 -- Increase recursive-load-depth-limit from 10 to 50 - -* Wed Dec 5 2001 Trond Eivind Glomsrød 21.1-2 -- Make it conflict with old versions of gettext - -* Thu Nov 29 2001 Trond Eivind Glomsrød 21.1-1 -- rpm-spec-mode 0.11h, should fix #56748 - -* Tue Nov 6 2001 Trond Eivind Glomsrød 21.1-0.4 -- php mode 1.0.1. Should fix some speedbar problems. - -* Tue Oct 23 2001 Trond Eivind Glomsrød 21.1-0.3 -- Minor cleanups -- add ssl.el - -* Mon Oct 22 2001 Trond Eivind Glomsrød 21.1-0.2 -- Add more files from the libexec directory (#54874, #54875) - -* Sun Oct 21 2001 Trond Eivind Glomsrød 21.1-0.1 -- 21.1 -- Build on IA64 again - the default config now handles it -- Drop all old patches -- Misc cleanups -- Update the elisp manual to 21-2.7 -- Deprecate the emacs-nox and emacs-X11 subpackages. - Simplify build procedure to match. -- Update php-mode to 1.0.0 - -* Mon Oct 15 2001 Trond Eivind Glomsrød 20.7-43 -- Add php-mode 0.9.9 -- Add URL (#54603) -- don't run autoconf/libtoolize during build - they're broken -- don't build on IA64 until they are fixed - -* Sun Sep 16 2001 Trond Eivind Glomsrød 20.7-42 -- Update python-mode to the version in the python 2.2a3 -- Include po-mode in emacs, instead of including in gettext - -* Mon Jul 30 2001 Trond Eivind Glomsrød -- Minor fix to make-mode fontify regexp (#50010) -- Build without emacs being installed (#49085) - -* Tue Jun 19 2001 Trond Eivind Glomsrød -- Much cleaner site-start.d sourcing -- Add more build dependencies -- Add the emacs lisp reference info pages (RFE #44577) -- Don't require tamago - just plug it in for Japanese support - -* Mon Jun 18 2001 Trond Eivind Glomsrød -- Add Xaw3d-devel to buildrequires (#44736) - -* Mon Jun 18 2001 Florian La Roche -- merged s390x patch from - -* Mon Jun 4 2001 Trond Eivind Glomsrød -- New rpm-spec-mode.el, which fixes #43323 - -* Thu Apr 26 2001 Florian La Roche -- fix linker problem on s390 (fix by Than Ngo than@redhat.com) - -* Wed Apr 25 2001 Trond Eivind Glomsrød -- Make sure that mwheel is initialized for XEmacs (#37451) - -* Fri Mar 16 2001 Trond Eivind Glomsrød -- New locale.alias file for emacs-nox - -* Tue Mar 6 2001 Trond Eivind Glomsrød -- update rpm-spec-mode.el to 0.11e - this should fix #30702 - -* Fri Feb 16 2001 Preston Brown -- require tamago, or japanese cannot be input (#27932). - -* Sat Jan 27 2001 Jakub Jelinek -- Preprocess Makefiles as if they were assembly, not C source. - -* Wed Jan 24 2001 Yukihiro Nakai -- Fix the fontset problem when creating a new frame. - -* Thu Jan 18 2001 Trond Eivind Glomsrød -- add Japanese support from Yukihiro Nakai - -* Thu Jan 04 2001 Preston Brown -- do not remove etags, only ctags, per Tom Tromey's suggestion. - -* Wed Dec 27 2000 Tim Powers -- bzipped sources to conserve space - -* Mon Dec 18 2000 Trond Eivind Glomsrød -- add /usr/share/emacs/locale.alias , which had gone AWOL -- update rpm-spec-mode to 0.11a, fresh from the author - (Stig Bjorlykke ). The changes we made - are integrated. - -* Fri Dec 15 2000 Trond Eivind Glomsrød -- prereq fileutils for emacs-nox - -* Mon Dec 11 2000 Trond Eivind Glomsrød -- do locale.alias fix for emacs-nox only, as it somehow - broke the subject line in gnus. Weird. -- update to gnus 5.8.7 - -* Fri Dec 08 2000 Than Ngo -- add support s390 machine - -* Thu Dec 07 2000 Trond Eivind Glomsrød -- add rpm-spec-mode after modifying (use Red Hat groups, - from /usr/share/doc/rpm-version/GROUPS) and fixing - colours(don't specify "yellow" on "bright") Also, - use gpg, not pgp. -- use it (site-start.el) -- add mwheel -- use it, in /etc/skel/.emacs - -* Thu Nov 30 2000 Trond Eivind Glomsrød -- add /usr/share/emacs/site-lisp/site-start.d -- change site-start.el so files in the above directory - are automatically run on startup -- don't set the ispell name in site-start.el, use the - above directory instead - -* Thu Oct 19 2000 Trond Eivind Glomsrød -- fix icon name in the .desktop file -- don't have site-start.el "noreplace" -- load psgml-init (if present) in the default site-start.el - to avoid psgml modifying the file - -* Tue Oct 17 2000 Trond Eivind Glomsrød -- new and better emacs.desktop file - -* Tue Oct 10 2000 Trond Eivind Glomsrød -- remove ctags.1 and etags.1 from the emacs etc directory - (#18011) -- fix the emacs-nox not to use the locale.alias in XFree86 - (#18548)... copy it into /usr/share/emacs and patch - the startup files to use it. Argh. - -* Wed Oct 04 2000 Trond Eivind Glomsrød -- fix initialization of python mode (require it before - customizing it) - -* Fri Sep 22 2000 Bill Nottingham -- don't use bcopy without a prototype - -* Thu Aug 24 2000 Trond Eivind Glomsrød -- define MAIL_USE_LOCKF -- remove setgid on movemail - -* Mon Aug 07 2000 Trond Eivind Glomsrød -- add /usr/share/emacs/site-lisp/subdirs.el (#15639) - -* Tue Jul 25 2000 Trond Eivind Glomsrød -- remove "-b" option from manpage - -* Fri Jul 21 2000 Trond Eivind Glomsrød -- remove Japanese support - -* Mon Jul 17 2000 Matt Wilson -- updated .desktop entry and icon - -* Wed Jul 12 2000 Prospector -- automatic rebuild - -* Fri Jul 07 2000 Trond Eivind Glomsrød -- fix some typos in spec file - -* Sun Jul 02 2000 Trond Eivind Glomsrød -- make /etc/skel/.emacs 0644 - -* Wed Jun 28 2000 Trond Eivind Glomsrød -- include python mode and change in site-start.el related to this -- some changes to the default .emacs - -* Mon Jun 26 2000 Matt Wilson -- don't build with -O2 on alpha until we can track down the compiler - bug that causes crashes in the garbage collector -- removed all the nox Japanese packages - -* Mon Jun 19 2000 Trond Eivind Glomsrød -- include site-start.el as a a config file -- add aspell support via the above - -* Fri Jun 16 2000 Trond Eivind Glomsrød -- (from MSW) different compression on IA64 to avoid hangs -- remove etags/ctags - use a separate package. Disable patch1 - -* Wed Jun 14 2000 Matt Wilson -- edited japanese patch not to patch configure -- fixed a missing escaped \" in a wc string -- merge japanese support to head of development - -* Tue Jun 13 2000 Trond Eivind Glomsrød -- Version 20.7 -- Add requirement for final newline to the default .emacs -- redid the Xaw3d patch -- checked all patches, discarded those we've upstreamed - -* Wed Jun 07 2000 Trond Eivind Glomsrød -- use %%{_mandir} and %%{_infodir} - -* Fri Jun 2 2000 Bill Nottingham -- add yet another ia64 patch - -* Mon May 22 2000 Bill Nottingham -- add another ia64 patch - -* Fri May 19 2000 Trond Eivind Glomsrød -- Disabled the compile patch for 20.6 - -* Thu May 18 2000 Bill Nottingham -- add in ia64 patch - -* Thu May 18 2000 Trond Eivind Glomsrød -- don't apply the unexelf patch - use a new unexelf.c file - from the 21 source tree (this will go into the 20.7 tree) - -* Wed May 17 2000 Trond Eivind Glomsrød -- added patch by jakub to make it work with glibc2.2 - -* Mon May 08 2000 Trond Eivind Glomsrød -- fixed a problem with ange-ftp and kerberized ftp - -* Mon May 08 2000 Bernhard Rosenkraenzer -- rebuild with new Xaw3d - -* Thu Apr 20 2000 Trond Eivind Glomsrød -- let the build system handle gzipping man pages and stripping -- added patch to increase keyboard buffer size - -* Thu Apr 20 2000 Trond Eivind Glomsrød -- gzip man pages - -* Thu Apr 20 2000 Trond Eivind Glomsrød -- added a security patch from RUS-CERT, which fixes - bugs mentioned in "Advisory 200004-01: GNU Emacs 20" - -* Tue Apr 18 2000 Trond Eivind Glomsrød -- patched to detect bash2 scripts. - -* Thu Apr 06 2000 Trond Eivind Glomsrød -- removed configuraton file status from /usr/share/pixmaps/emacs.png - -* Fri Mar 24 2000 Bernhard Rosenkraenzer -- update to 20.6 and make it compile - -* Mon Feb 21 2000 Preston Brown -- add .emacs make the delete key work to delete forward character for X ver. - -* Wed Feb 16 2000 Cristian Gafton -- fix bug #2988 -- recompile patched .el files (suggested by Pavel.Janik@linux.cz) -- prereq /sbin/install-info - -* Mon Feb 07 2000 Preston Brown -- wmconfig gone - -* Thu Feb 03 2000 Cristian Gafton -- fix descriptions and summary -- fix permissions for emacs niaries (what the hell does 1755 means for a - binary?) -- added missing, as per emacs Changelog, NCURSES_OSPEED_T compilation - flag; without it emacs on Linux is making global 'ospeed' short which - is not the same as 'speed_t' expected by libraries. (reported by Michal - Jaegermann ) - -* Mon Jan 10 2000 David S. Miller -- Revert src/unexecelf.c to 20.4 version, fixes SPARC problems. - -* Sun Jan 9 2000 Matt Wilson -- strip emacs binary -- disable optimizations for now, they cause illegal instructions on SPARC. - -* Sun Jan 09 2000 Paul Fisher -- upgrade to 20.5a -- remove python-mode, wheelmouse support, and auctex menu -- import emacs.desktop with icon from GNOME - -* Wed Dec 08 1999 Ngo Than -- added python-mode, wheelmouse support and auctex menu -- added Comment[de] in emacs.desktop - -* Sat Sep 25 1999 Preston Brown -- added desktop entry - -* Thu Sep 23 1999 Preston Brown -- tried to fix triggers, hopefully working now. - -* Wed Sep 01 1999 Preston Brown -- added trigger for making symlink to /usr/bin/emacs in emacs-nox package - -* Thu Jul 22 1999 Paul Fisher -- upgrade to 20.4 -- cleaned up spec - -* Fri Apr 16 1999 Owen Taylor -- replace bad xemacs compiled .elc file for mh-e with one compiled - on emacs - -* Thu Apr 15 1999 Bill Nottingham -- make sure movemail doesn't get %%defattr()'d to root.root - -* Wed Apr 14 1999 Cristian Gafton -- patch to make it work with dxpc - -* Wed Mar 31 1999 Preston Brown -- updated mh-utils emacs lisp file to match our nmh path locations - -* Sun Mar 21 1999 Cristian Gafton -- auto rebuild in the new build environment (release 9) - -* Fri Feb 26 1999 Cristian Gafton -- linker scripts hack to make it build on the alpha - -* Fri Jan 1 1999 Jeff Johnson -- add leim package (thanks to Pavel.Janik@inet.cz). - -* Fri Dec 18 1998 Cristian Gafton -- build against glibc 2.1 - -* Wed Sep 30 1998 Cristian Gafton -- backed up changes to uncompress.el (it seems that the one from 20.2 works - much better) - -* Mon Sep 28 1998 Jeff Johnson -- eliminate /tmp race in rcs2log - -* Wed Sep 09 1998 Cristian Gafton -- upgrade to 20.3 - -* Tue Jun 9 1998 Jeff Johnson -- add --with-pop to X11 compile. -- include contents of /usr/share/.../etc with main package. - -* Mon Jun 01 1998 Prospector System -- translations modified for de, fr - -* Mon Jun 01 1998 David S. Miller -- fix signals when linked with glibc on non-Intel architectures - NOTE: This patch is not needed with emacs >20.2 - -* Thu May 07 1998 Prospector System - -- translations modified for de, fr, tr - -* Thu May 07 1998 Cristian Gafton -- added /usr/lib/emacs/20.2/*-redhat-linux directory in the filelist - -* Thu Apr 09 1998 Cristian Gafton -- alpha started to like emacs-nox again :-) - -* Thu Nov 6 1997 Michael Fulbright -- alpha just doesnt like emacs-nox, taking it out for now - -* Mon Nov 3 1997 Michael Fulbright -- added multibyte support back into emacs 20.2 -- added wmconfig for X11 emacs -- fixed some errant buildroot references - -* Thu Oct 23 1997 Michael Fulbright -- joy a new version of emacs! Of note - no lockdir any more. -- use post/preun sections to handle numerous GNU info files - -* Mon Oct 06 1997 Erik Troan -- stopped stripping it as it seems to break things - -* Sun Sep 14 1997 Erik Troan -- turned off ecoff support on the Alpha (which doesn't build anymore) - -* Mon Jun 16 1997 Erik Troan -- built against glibc - -* Fri Feb 07 1997 Michael K. Johnson -- Moved ctags to gctags to fit in the more powerful for C (but less - general) exuberant ctags as the binary /usr/bin/ctags and the - man page /usr/man/man1/ctags.1 +* Sat Oct 21 2023 Peter Oliver - 1:29.1-10 +- RPMAUTOSPEC: unresolvable merge +## END: Generated by rpmautospec diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index eb7c84f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/sources b/sources index 5728ced..ec63487 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (emacs-26.1.tar.xz) = 537c2cfdd281151b360002419dde6280c313e07a937ed96405c67f754b3401ec5541091a3c0aa6690929bc33dd79e8e0d8844e7a6b014b7798c63cb15de210c2 -SHA512 (package-keyring.gpg) = ca0dfa2edda9a6de5837dd6d754d574b13e007561e8dcc99c178d24f6a5dbb6880edc95db9d6afbea8bdf0b409671657fe22a778003ea0ccf351dce5e4fd429f +SHA512 (emacs-29.4.tar.xz) = 66b38081cb01d2c46ff7beefb45986cc225b4c922c30712ad0d456c6cae5507176ed99418c8f26948c5375c8afde4e4b2507d23ed997dbb5392d12150a121d80