Accepting request 625004 from home:tiwai:branches:M17N

- Fix build with the latest emacs:
  apel-emacs-escape-fix.patch

OBS-URL: https://build.opensuse.org/request/show/625004
OBS-URL: https://build.opensuse.org/package/show/M17N/emacs-apel?expand=0&rev=4

apel-emacs-escape-fix.patch

@@ -0,0 +1,38 @@
+---
+ poe.el |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/poe.el
++++ b/poe.el
+@@ -1079,11 +1079,11 @@ If the replaced text has at least one wo
+ then capitalize each word in NEWTEXT.
+ 
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+-Otherwise treat `\' as special:
+-  `\&' in NEWTEXT means substitute original matched text.
+-  `\N' means substitute what matched the Nth `\(...\)'.
++Otherwise treat `\\' as special:
++  `\\&' in NEWTEXT means substitute original matched text.
++  `\\N' means substitute what matched the Nth `\(...\)'.
+        If Nth parens didn't match, substitute nothing.
+-  `\\' means insert one `\'.
++  `\\\\' means insert one `\\'.
+ FIXEDCASE and LITERAL are optional arguments.
+ Leaves point at end of replacement text.
+ 
+@@ -1131,11 +1131,11 @@ If the replaced text has at least one wo
+ then capitalize each word in NEWTEXT.
+ 
+ If third arg LITERAL is non-nil, insert NEWTEXT literally.
+-Otherwise treat `\' as special:
+-  `\&' in NEWTEXT means substitute original matched text.
+-  `\N' means substitute what matched the Nth `\(...\)'.
++Otherwise treat `\\' as special:
++  `\\&' in NEWTEXT means substitute original matched text.
++  `\\N' means substitute what matched the Nth `\(...\)'.
+        If Nth parens didn't match, substitute nothing.
+-  `\\' means insert one `\'.
++  `\\\\' means insert one `\\'.
+ FIXEDCASE and LITERAL are optional arguments.
+ Leaves point at end of replacement text.
+ 

emacs-apel.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 23 18:12:13 CEST 2018 - tiwai@suse.de
+
+- Fix build with the latest emacs:
+  apel-emacs-escape-fix.patch
+
 -------------------------------------------------------------------
 Mon Oct 27 15:43:07 UTC 2014 - i@marguerite.su
 

emacs-apel.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package emacs-apel
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -20,7 +20,7 @@ Name:           emacs-apel
 Version:        10.8
 Release:        0
 Summary:        A Portable Emacs Library
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Editors/Emacs
 Url:            http://git.chise.org/elisp/apel
 Source:         http://git.chise.org/elisp/dist/apel/apel-%{version}.tar.gz
@@ -28,11 +28,12 @@ Source1:        suse-start-apel.el
 Patch0:         prevent-fontset-error.patch
 # PATCH-FIX-UPSTREAM
 Patch1:         apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch
+Patch2:         apel-emacs-escape-fix.patch
 BuildRequires:  emacs-nox
 Requires:       emacs
 Requires:       emacs_program
-Provides:	apel = %{version}
+Provides:       apel = %{version}
-Obsoletes:	apel < %{version}
+Obsoletes:      apel < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -45,6 +46,7 @@ A Portable Emacs Library
 %if 0%{?suse_version} > 1310
 %patch1 -p1
 %endif
+%patch2 -p1
 cp -p %{SOURCE1} .
 iconv -fiso2022jp -tutf-8 README.ja > README.ja.new
 mv README.ja.new README.ja