- up to 26.3

diff --git a/emacs.spec b/emacs.spec
index 28be14971f9b8d25c65f78c3e30bbbdf9fa09ecd..28f734b0c5c65c184a4b09e2e1535b9a7ec290a1 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -18,13 +18,13 @@ Summary(pl.UTF-8):  GNU Emacs - edytor tekstu dla systemu X Window
 Summary(pt_BR.UTF-8):  GNU Emacs
 Summary(tr.UTF-8):     GNU Emacs
 Name:          emacs
-%define        ver     25.1
+%define        ver     26.3
 Version:       %{ver}
-Release:       10
+Release:       1
 License:       GPL v3+
 Group:         Applications/Editors/Emacs
 Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.xz
-# Source0-md5: 4f3d42fb22823a659e16bfa89078a74c
+# Source0-md5: 0a2e4b965d31a7cb1930eae3b79df793
 Source1:       %{name}-dot%{name}
 Source2:       %{name}-site-start.el
 Source3:       %{name}.png
@@ -581,7 +581,6 @@ fi
 %attr(2755,root,mail) %{_libexecdir}/emacs/%{ver}/*-linux*/movemail
 %attr(755,root,mail) %{_libexecdir}/emacs/%{ver}/*-linux*/profile
 %attr(755,root,mail) %{_libexecdir}/emacs/%{ver}/*-linux*/rcs2log
-%attr(755,root,mail) %{_libexecdir}/emacs/%{ver}/*-linux*/update-game-score
 
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/%{ver}
@@ -601,6 +600,7 @@ fi
 %dir %{_datadir}/emacs/%{ver}/lisp/emacs-lisp
 %dir %{_datadir}/emacs/%{ver}/lisp/emulation
 %dir %{_datadir}/emacs/%{ver}/lisp/eshell
+%dir %{_datadir}/emacs/%{ver}/lisp/image
 %dir %{_datadir}/emacs/%{ver}/lisp/international
 %dir %{_datadir}/emacs/%{ver}/lisp/language
 %dir %{_datadir}/emacs/%{ver}/lisp/mail
@@ -632,7 +632,6 @@ fi
 %{_datadir}/emacs/%{ver}/lisp/eshell/esh-groups.el
 %{_datadir}/emacs/%{ver}/lisp/international/*.el
 %{_datadir}/emacs/%{ver}/lisp/international/*.elc
-%{_datadir}/emacs/%{ver}/lisp/international/README
 %{_datadir}/emacs/%{ver}/lisp/language/*.elc
 %{_datadir}/emacs/%{ver}/lisp/cedet/*.elc
 %{_datadir}/emacs/%{ver}/lisp/cedet/ede/*.el
@@ -646,27 +645,27 @@ fi
 %{_datadir}/emacs/%{ver}/lisp/cedet/semantic/wisent/*.elc
 %{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.el
 %{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.elc
+%{_datadir}/emacs/%{ver}/lisp/image/*.elc
 %{_datadir}/emacs/%{ver}/lisp/mail/blessmail.el
+%{_datadir}/emacs/%{ver}/lisp/mail/rmail-loaddefs.el
 %{_datadir}/emacs/%{ver}/lisp/mail/*.elc
 %{_datadir}/emacs/%{ver}/lisp/mh-e/*.el
 %{_datadir}/emacs/%{ver}/lisp/mh-e/*.elc
 %{_datadir}/emacs/%{ver}/lisp/net/*.el
 %{_datadir}/emacs/%{ver}/lisp/net/*.elc
 %{_datadir}/emacs/%{ver}/lisp/nxml/*.elc
+%{_datadir}/emacs/%{ver}/lisp/obsolete/messcompat.el
 %{_datadir}/emacs/%{ver}/lisp/obsolete/*.elc
 %{_datadir}/emacs/%{ver}/lisp/org/*.el
 %{_datadir}/emacs/%{ver}/lisp/org/*.elc
 %{_datadir}/emacs/%{ver}/lisp/play/*.elc
 %{_datadir}/emacs/%{ver}/lisp/progmodes/*.elc
 %{_datadir}/emacs/%{ver}/lisp/term/*.elc
+%{_datadir}/emacs/%{ver}/lisp/textmodes/reftex-loaddefs.el
 %{_datadir}/emacs/%{ver}/lisp/textmodes/*.elc
 %{_datadir}/emacs/%{ver}/lisp/url/*.elc
 %{_datadir}/emacs/%{ver}/lisp/vc/*.elc
 
-%dir /var/games/emacs
-/var/games/emacs/tetris-scores
-/var/games/emacs/snake-scores
-
 %{_datadir}/emacs/%{ver}/site-lisp/subdirs.el
 %{_datadir}/emacs/%{ver}/site-lisp/tuareg.el
 %{_datadir}/emacs/%{ver}/site-lisp/nemerle.el
@@ -688,6 +687,7 @@ fi
 %{_datadir}/emacs/%{ver}/lisp/emacs-lisp/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/emulation/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/eshell/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/image/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/international/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/language/*.el.gz
 %{_datadir}/emacs/%{ver}/lisp/mail/*.el.gz

diff --git a/imagemagick7.patch b/imagemagick7.patch
index 199219b4d15ff2dbe325114192420a1241dd5522..1fbaf221a8b3331d210be1a5a488987a024b4b5f 100644 (file)
--- a/imagemagick7.patch
+++ b/imagemagick7.patch
@@ -1,14 +1,14 @@
 --- emacs-25.1/configure.ac~   2016-07-25 09:08:36.000000000 +0200
 +++ emacs-25.1/configure.ac    2016-12-25 13:00:06.594562908 +0100
-@@ -2413,7 +2413,7 @@
-   if test "${with_imagemagick}" != "no"; then
+@@ -2524,7 +2524,7 @@ if test "${HAVE_X11}" = "yes" || test "$
      ## 6.3.5 is the earliest version known to work; see Bug#17339.
      ## 6.8.2 makes Emacs crash; see Bug#13867.
--    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2"
-+    IMAGEMAGICK_MODULE="MagickWand >= 6.3.5 MagickWand != 6.8.2"
+     ## 7 and later have not been ported to; See Bug#25967.
+-    IMAGEMAGICK_MODULE="Wand >= 6.3.5 Wand != 6.8.2 Wand < 7"
++    IMAGEMAGICK_MODULE="MagicWand >= 6.3.5 Wand != 6.8.2"
      EMACS_CHECK_MODULES([IMAGEMAGICK], [$IMAGEMAGICK_MODULE])
-     AC_SUBST(IMAGEMAGICK_CFLAGS)
-     AC_SUBST(IMAGEMAGICK_LIBS)
+ 
+     if test $HAVE_IMAGEMAGICK = yes; then
 --- emacs-24.3/src/image.c~    2016-12-25 12:47:48.000000000 +0100
 +++ emacs-24.3/src/image.c     2016-12-25 12:52:35.931084598 +0100
 @@ -7618,14 +7618,14 @@