From e493955ccb4b62663919d2ab8a190e56120499518d4c237e00474af6b6eddec4 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 25 Apr 2017 11:46:13 +0000
Subject: [PATCH] Final update tp GNU Emacs 25.2

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=226
---
 emacs-25.2-rc2.tar.xz |  3 ---
 emacs-25.2.tar.xz     |  3 +++
 emacs.changes         | 28 ++++++++++++++++++++++++++++
 emacs.spec            |  7 ++++---
 4 files changed, 35 insertions(+), 6 deletions(-)
 delete mode 100644 emacs-25.2-rc2.tar.xz
 create mode 100644 emacs-25.2.tar.xz

diff --git a/emacs-25.2-rc2.tar.xz b/emacs-25.2-rc2.tar.xz
deleted file mode 100644
index eac1289..0000000
--- a/emacs-25.2-rc2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f405314b427f9fdfc3fe89c3a062524156b23e07396427bb16d30ba1a8bf687
-size 43014244
diff --git a/emacs-25.2.tar.xz b/emacs-25.2.tar.xz
new file mode 100644
index 0000000..b8e754a
--- /dev/null
+++ b/emacs-25.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa
+size 46900336
diff --git a/emacs.changes b/emacs.changes
index d8d8851..bdefd25 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Tue Apr 25 10:43:33 UTC 2017 - werner@suse.de
+
+- Update to emacs version 25.2 a bugfix release
+  * '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.
+
 -------------------------------------------------------------------
 Wed Apr 12 09:25:13 UTC 2017 - pgajdos@suse.com
 
diff --git a/emacs.spec b/emacs.spec
index 52287ce..1842e09 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -20,7 +20,7 @@
 %if %{suse_version} >= 1330
 %bcond_without  autoconf
 %endif
-# Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.1)
+# Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.2)
 %bcond_with     cairo
 
 Name:           emacs
@@ -103,8 +103,7 @@ 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://alpha.gnu.org/gnu/emacs/pretest/emacs-%{version}-rc2.tar.xz
+Source:         ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
 Source1:        app-defaults.Emacs
 Source2:        site-lisp.tar.bz2
 Source3:        dot.gnu-emacs
@@ -380,6 +379,7 @@ DESKTOP="--with-x \
 %else
 	 --with-x-toolkit=gtk2 \
 %endif
+	 --with-toolkit-scroll-bars \
 	 --x-includes=%{_x11inc} \
 	 --x-libraries=%{_x11lib} \
 	 --with-libotf \
@@ -390,6 +390,7 @@ DESKTOP="--with-x \
 "
     X11="${DESKTOP} \
 	 --with-x-toolkit=lucid \
+	 --with-toolkit-scroll-bars \
 	 --x-includes=%{_x11inc} \
 	 --x-libraries=%{_x11lib}:%{_x11data} \
 	 --without-libotf \