diff --git a/emacs-24.4-glibc.patch b/emacs-24.4-glibc.patch index 734680e..c51c97b 100644 --- a/emacs-24.4-glibc.patch +++ b/emacs-24.4-glibc.patch @@ -4,8 +4,8 @@ 2 files changed, 2 insertions(+) --- configure.ac -+++ configure.ac 2016-09-19 08:54:17.383277267 +0000 -@@ -2203,6 +2203,7 @@ fi ++++ configure.ac 2017-02-27 14:03:47.908816992 +0000 +@@ -2197,6 +2197,7 @@ fi use_mmap_for_buffers=no case "$opsys" in cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;; @@ -14,8 +14,8 @@ AC_FUNC_MMAP --- configure -+++ configure 2016-09-19 08:54:30.971020865 +0000 -@@ -11572,6 +11572,7 @@ fi ++++ configure 2017-02-27 14:03:47.912816917 +0000 +@@ -11576,6 +11576,7 @@ fi use_mmap_for_buffers=no case "$opsys" in cygwin|mingw32|freebsd|irix6-5) use_mmap_for_buffers=yes ;; diff --git a/emacs-24.4-ps-bdf.patch b/emacs-24.4-ps-bdf.patch index b654551..b4a0873 100644 --- a/emacs-24.4-ps-bdf.patch +++ b/emacs-24.4-ps-bdf.patch @@ -4,9 +4,9 @@ 2 files changed, 4 insertions(+), 4 deletions(-) --- lisp/ldefs-boot.el -+++ lisp/ldefs-boot.el 2016-09-19 09:01:36.090998408 +0000 -@@ -22107,9 +22107,9 @@ With prefix argument ARG, restart the Pr - ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22388 5707 728611 808000)) ++++ lisp/ldefs-boot.el 2017-02-27 14:06:23.653891166 +0000 +@@ -22142,9 +22142,9 @@ With prefix argument ARG, restart the Pr + ;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (22676 23208 878521 628000)) ;;; Generated autoloads from ps-bdf.el -(defvar bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) (list (expand-file-name "fonts/bdf" installation-directory)) '("/usr/local/share/emacs/fonts/bdf")) "\ @@ -18,7 +18,7 @@ (custom-autoload 'bdf-directory-list "ps-bdf" t) --- lisp/ps-bdf.el -+++ lisp/ps-bdf.el 2016-09-19 09:00:21.828399872 +0000 ++++ lisp/ps-bdf.el 2017-02-27 14:04:37.999877798 +0000 @@ -42,9 +42,9 @@ (defcustom bdf-directory-list (if (memq system-type '(ms-dos windows-nt)) diff --git a/emacs-25.2-rc2.tar.xz b/emacs-25.2-rc2.tar.xz new file mode 100644 index 0000000..eac1289 --- /dev/null +++ b/emacs-25.2-rc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f405314b427f9fdfc3fe89c3a062524156b23e07396427bb16d30ba1a8bf687 +size 43014244 diff --git a/emacs-25.1.dif b/emacs-25.2.dif similarity index 96% rename from emacs-25.1.dif rename to emacs-25.2.dif index 4c86732..410e355 100644 --- a/emacs-25.1.dif +++ b/emacs-25.2.dif @@ -19,7 +19,7 @@ 17 files changed, 445 insertions(+), 32 deletions(-) --- Makefile.in -+++ Makefile.in 2016-09-19 09:49:37.296950020 +0000 ++++ Makefile.in 2017-02-27 14:06:59.669213860 +0000 @@ -493,8 +493,8 @@ install-arch-dep: src install-arch-indep umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}" $(MAKE) -C lib-src install @@ -49,8 +49,8 @@ rm -f hicolor/*x*/apps/${EMACS_NAME}.png \ hicolor/scalable/apps/${EMACS_NAME}.svg \ --- configure -+++ configure 2016-09-19 09:53:00.097191627 +0000 -@@ -10749,10 +10749,8 @@ fi ++++ configure 2017-02-27 14:07:01.677176097 +0000 +@@ -10748,10 +10748,8 @@ fi LD_SWITCH_X_SITE_RPATH= if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then @@ -64,8 +64,8 @@ x_default_search_path="" x_search_path=${x_libraries} --- configure.ac -+++ configure.ac 2016-09-19 09:52:02.546258535 +0000 -@@ -1727,10 +1727,8 @@ fi ++++ configure.ac 2017-02-27 14:06:59.673213785 +0000 +@@ -1726,10 +1726,8 @@ fi LD_SWITCH_X_SITE_RPATH= if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then @@ -79,7 +79,7 @@ x_default_search_path="" x_search_path=${x_libraries} --- doc/man/etags.1 -+++ doc/man/etags.1 2016-09-19 09:54:09.419906131 +0000 ++++ doc/man/etags.1 2017-02-27 14:06:59.673213785 +0000 @@ -7,7 +7,7 @@ .. @@ -163,7 +163,7 @@ .B \-h, \-H, \-\-help Print usage information. Followed by one or more \-\-language=LANG --- lib-src/Makefile.in -+++ lib-src/Makefile.in 2016-09-19 09:56:30.249261196 +0000 ++++ lib-src/Makefile.in 2017-02-27 14:06:59.673213785 +0000 @@ -150,7 +150,7 @@ MKDIR_P = @MKDIR_P@ CLIENTW = @CLIENTW@ @@ -183,7 +183,7 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \ --- lib-src/pop.c -+++ lib-src/pop.c 2016-09-19 09:25:18.256204648 +0000 ++++ lib-src/pop.c 2017-02-27 14:06:59.673213785 +0000 @@ -26,6 +26,7 @@ along with GNU Emacs. If not, see --- lisp/cmuscheme.el -+++ lisp/cmuscheme.el 2016-09-19 09:25:18.256204648 +0000 ++++ lisp/cmuscheme.el 2017-02-27 14:06:59.673213785 +0000 @@ -241,7 +241,8 @@ is run). (read-string "Run Scheme: " scheme-program-name) scheme-program-name))) @@ -205,7 +205,7 @@ (scheme-start-file (car cmdlist)) (cdr cmdlist))) (inferior-scheme-mode))) --- lisp/international/mule-cmds.el -+++ lisp/international/mule-cmds.el 2016-09-19 09:25:18.256204648 +0000 ++++ lisp/international/mule-cmds.el 2017-02-27 14:06:59.673213785 +0000 @@ -39,6 +39,7 @@ (defvar mule-keymap @@ -215,7 +215,7 @@ (define-key map "r" 'revert-buffer-with-coding-system) (define-key map "F" 'set-file-name-coding-system) --- lisp/net/ange-ftp.el -+++ lisp/net/ange-ftp.el 2016-09-19 09:25:18.256204648 +0000 ++++ lisp/net/ange-ftp.el 2017-02-27 14:06:59.673213785 +0000 @@ -4985,7 +4985,7 @@ NEWNAME should be the name to give the n ; "If a host matches this regexp then it is assumed to be running VOS.") ; @@ -253,7 +253,7 @@ (defun ange-ftp-add-cms-host (host) --- lisp/site-load.el -+++ lisp/site-load.el 2016-09-19 09:25:18.256204648 +0000 ++++ lisp/site-load.el 2017-02-27 14:06:59.673213785 +0000 @@ -0,0 +1,41 @@ +;;;; +;;; emacs20.xx/lisp/site-load.el @@ -297,7 +297,7 @@ + +;;; site-load.el ends here --- lisp/speedbar.el -+++ lisp/speedbar.el 2016-09-19 09:25:18.260204572 +0000 ++++ lisp/speedbar.el 2017-02-27 14:06:59.673213785 +0000 @@ -794,6 +794,7 @@ If you want to change this while speedba ;; Navigation. @@ -307,7 +307,7 @@ (define-key map "\M-n" 'speedbar-restricted-next) (define-key map "\M-p" 'speedbar-restricted-prev) --- lisp/textmodes/ispell.el -+++ lisp/textmodes/ispell.el 2016-09-19 09:25:18.260204572 +0000 ++++ lisp/textmodes/ispell.el 2017-02-27 14:06:59.673213785 +0000 @@ -351,10 +351,12 @@ Must be greater than 1." :group 'ispell) @@ -383,7 +383,7 @@ `(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary :help ,(purecopy "Supply explicit dictionary file name"))) --- site-lisp/term/func-keys.el -+++ site-lisp/term/func-keys.el 2016-09-19 09:25:18.260204572 +0000 ++++ site-lisp/term/func-keys.el 2017-02-27 14:06:59.673213785 +0000 @@ -0,0 +1,33 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/func-keys.el for site-lisp path @@ -419,7 +419,7 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von func-keys.el --- site-lisp/term/gnome.el -+++ site-lisp/term/gnome.el 2016-09-19 09:25:18.260204572 +0000 ++++ site-lisp/term/gnome.el 2017-02-27 14:06:59.673213785 +0000 @@ -0,0 +1,97 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/gnomw.el for site-lisp path @@ -519,7 +519,7 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von gnomw.el --- site-lisp/term/kvt.el -+++ site-lisp/term/kvt.el 2016-09-19 09:25:18.260204572 +0000 ++++ site-lisp/term/kvt.el 2017-02-27 14:06:59.677213709 +0000 @@ -0,0 +1,97 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/kvt.el for site-lisp path @@ -619,7 +619,7 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von kvt.el --- site-lisp/term/linux.el -+++ site-lisp/term/linux.el 2016-09-19 09:25:18.260204572 +0000 ++++ site-lisp/term/linux.el 2017-02-27 14:06:59.677213709 +0000 @@ -0,0 +1,79 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/linux.el for site-lisp path @@ -701,7 +701,7 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Ende von linux.el --- site-lisp/term/locale.el -+++ site-lisp/term/locale.el 2016-09-19 09:25:18.260204572 +0000 ++++ site-lisp/term/locale.el 2017-02-27 14:06:59.677213709 +0000 @@ -0,0 +1,13 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; term/locale.el for site-lisp path diff --git a/emacs.changes b/emacs.changes index bba69ea..d639b70 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Tue Feb 28 12:28:46 UTC 2017 - werner@suse.de + +- Test out release candidate of emacs bugfix release 25.2 + * 'find-library', 'help-function-def' and 'help-variable-def' now run + 'find-function-after-hook'. + * New basic face 'fixed-pitch-serif', for a fixed-width font with serifs. + The 'Info-quoted' and 'tex-verbatim' faces inherit from it by default. + * New variable 'use-default-font-for-symbols', for backward compatibility. + This variable allows you to get back pre-Emacs 25 behavior where the + font for displaying symbol and punctuation characters was always + selected according to your fontset setup. By default, Emacs 25 tries + to use the default face's font for such characters, if it supports + them, disregarding the fontsets. Set this variable to nil to disable + this and get back the old behavior. + * 'electric-quote-mode' is no longer suppressed in a buffer whose + coding system cannot represent curved quote characters. + Instead, users can deal with the unrepresentable characters in the + usual way when they save the buffer. + * New variable 'inhibit-compacting-font-caches'. + Set this variable to a non-nil value to speed up display of characters + using large fonts, at the price of a larger memory footprint. + * The version number of CC Mode has been changed from 5.33 to + 5.32.99, although the software itself hasn't changed. This aims to + reduce confusion with the standalone CC Mode 5.33 (available from + http://cc-mode.sourceforge.net), which is a more mature version than + the one included in Emacs 25.2. +- Patch emacs-25.1.dif renamed to emacs-25.2.dif +- Modified patches emacs-24.4-glibc.patch and emacs-24.4-ps-bdf.patch + ------------------------------------------------------------------- Tue Dec 20 16:10:47 UTC 2016 - werner@suse.de diff --git a/emacs.spec b/emacs.spec index adf75a0..9d0c8c8 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,7 +1,7 @@ # # spec file for package emacs # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -83,7 +83,7 @@ BuildRequires: xorg-x11-devel BuildRequires: xz BuildRequires: zlib-devel Url: http://www.gnu.org/software/emacs/ -Version: 25.1 +Version: 25.2 Release: 0 %if 0%{suse_version} >= 1300 Requires: etags @@ -100,13 +100,13 @@ Obsoletes: nxml-mode < 20041004 Provides: epg = 1.0.0 Obsoletes: epg < 1.0.0 Requires(pre): fileutils -Source: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz +Source: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}-rc2.tar.xz Source1: app-defaults.Emacs Source2: site-lisp.tar.bz2 Source3: dot.gnu-emacs Source4: emacs-rpmlintrc Source5: emacs.sh -Patch: emacs-25.1.dif +Patch: emacs-25.2.dif # PATCH-FIX-UPSTREAM Adjust to GnuPG 2.1 key listing change Patch2: emacs-24.4-glibc.patch Patch3: emacs-24.4-decl.dif @@ -1575,7 +1575,6 @@ fi %doc %{_datadir}/emacs/%{version}/etc/refcards/dired-ref.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/dired-ref.tex %doc %{_datadir}/emacs/%{version}/etc/refcards/emacsver.tex -%doc %{_datadir}/emacs/%{version}/etc/refcards/emacsver.tex.in %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-dired-ref.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-dired-ref.tex %doc %{_datadir}/emacs/%{version}/etc/refcards/fr-refcard.pdf @@ -1590,13 +1589,19 @@ fi %doc %{_datadir}/emacs/%{version}/etc/refcards/orgcard.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/orgcard.tex %doc %{_datadir}/emacs/%{version}/etc/refcards/pdflayout.sty +%doc %{_datadir}/emacs/%{version}/etc/refcards/pl-refcard.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/pl-refcard.tex +%doc %{_datadir}/emacs/%{version}/etc/refcards/pt-br-refcard.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/pt-br-refcard.tex %doc %{_datadir}/emacs/%{version}/etc/refcards/refcard.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/refcard.tex +%doc %{_datadir}/emacs/%{version}/etc/refcards/ru-refcard.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/ru-refcard.tex +%doc %{_datadir}/emacs/%{version}/etc/refcards/sk-dired-ref.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/sk-dired-ref.tex +%doc %{_datadir}/emacs/%{version}/etc/refcards/sk-refcard.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/sk-refcard.tex +%doc %{_datadir}/emacs/%{version}/etc/refcards/sk-survival.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/sk-survival.tex %doc %{_datadir}/emacs/%{version}/etc/refcards/survival.pdf %doc %{_datadir}/emacs/%{version}/etc/refcards/survival.tex