From 611eb8fa8cddab420551a0a4e896feb0b54edcbb38e16fd5bebed98e6f90a7f3 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 24 Aug 2020 11:15:15 +0000
Subject: [PATCH] emacs manual page

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=291
---
 emacs-27.1.dif    | 35 +----------------------------------
 emacs.changes     |  5 +++++
 emacs.spec        |  7 ++++---
 site-lisp.tar.bz2 |  4 ++--
 4 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/emacs-27.1.dif b/emacs-27.1.dif
index 95f076d..d3fe861 100644
--- a/emacs-27.1.dif
+++ b/emacs-27.1.dif
@@ -2,7 +2,6 @@
  Makefile.in                     |    7 +-
  configure                       |    6 --
  configure.ac                    |    6 --
- doc/man/emacs.1.in              |   10 ++--
  doc/man/etags.1                 |   20 ++++----
  lib-src/Makefile.in             |    6 +-
  lib-src/pop.c                   |    1 
@@ -18,7 +17,7 @@
  site-lisp/term/kvt.el           |   97 ++++++++++++++++++++++++++++++++++++++++
  site-lisp/term/linux.el         |   79 ++++++++++++++++++++++++++++++++
  site-lisp/term/locale.el        |   13 +++++
- 19 files changed, 480 insertions(+), 37 deletions(-)
+ 18 files changed, 475 insertions(+), 32 deletions(-)
 
 --- Makefile.in
 +++ Makefile.in	2020-08-11 10:21:15.194072175 +0000
@@ -83,38 +82,6 @@
    fi
    x_default_search_path=""
    x_search_path=${x_libraries}
---- doc/man/emacs.1.in
-+++ doc/man/emacs.1.in	2020-08-21 08:46:16.648349971 +0000
-@@ -563,24 +563,24 @@ distribution.
- .
- .
- .SH FILES
--/usr/local/share/info \(em files for the Info documentation browser.
-+/usr/share/info \(em files for the Info documentation browser.
- The complete text of the Emacs reference manual is included in a
- convenient tree structured form.
- Also includes the Emacs Lisp Reference Manual, useful to anyone
- wishing to write programs in the Emacs Lisp extension language,
- and the Introduction to Programming in Emacs Lisp.
- 
--/usr/local/share/emacs/$VERSION/lisp \(em Lisp source files and
-+/usr/share/emacs/$VERSION/lisp \(em Lisp source files and
- compiled files that define most editing commands.
- Some are preloaded; others are autoloaded from this directory when
- used.
- 
--/usr/local/libexec/emacs/$VERSION/$ARCH \(em various programs that are
-+/usr/lib/emacs/$VERSION/$ARCH \(em various programs that are
- used with GNU Emacs.
- 
--/usr/local/share/emacs/$VERSION/etc \(em various files of information.
-+/usr/share/emacs/$VERSION/etc \(em various files of information.
- 
--/usr/local/share/emacs/$VERSION/etc/DOC.* \(em contains the documentation
-+/usr/share/emacs/$VERSION/etc/DOC.* \(em contains the documentation
- strings for the Lisp primitives and preloaded Lisp functions
- of GNU Emacs.
- They are stored here to reduce the size of Emacs proper.
 --- doc/man/etags.1
 +++ doc/man/etags.1	2020-08-11 10:17:21.102266456 +0000
 @@ -7,7 +7,7 @@
diff --git a/emacs.changes b/emacs.changes
index 3a6b618..9568b45 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 24 11:14:22 UTC 2020 - Dr. Werner Fink <werner@suse.de>
+
+- Correct paths for emacs manual page on the fly 
+
 -------------------------------------------------------------------
 Fri Aug 21 10:27:50 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/emacs.spec b/emacs.spec
index 2bb3056..070a427 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -481,8 +481,8 @@ export ac_cv_lib_gif_EGifPutExtensionLast
 CFLAGS="$CFLAGS $SMALL -DPDMP_BASE='\"emacs-nox\"'" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS} --with-dumping=pdumper
 make bootstrap V=1
 make -C lisp/ updates compile V=1
-for i in `find site-lisp/ -name '*.el'`; do
-    src/emacs -batch -q --no-site -f batch-byte-compile $i; \
+for i in $(find site-lisp/ -name '*.el'); do
+    EMACSLOADPATH='' src/emacs -batch -q --no-site -f batch-byte-compile $i
 done
 cp src/emacs emacs-nox
 cp src/emacs.pdmp emacs-nox.pdmp
@@ -506,7 +506,7 @@ make -C etc/refcards/
 
 #
 pushd ../site-lisp/
-../emacs-%{version}/src/emacs -batch -q --no-site -f batch-byte-compile *.el
+EMACSLOADPATH='' ../emacs-%{version}/src/emacs -batch -q --no-site -f batch-byte-compile *.el
 rm -vf site-start.elc
 rm -vf site-start.el.orig
 popd
@@ -517,6 +517,7 @@ PATH=/sbin:$PATH
 ##
 VERSION=%{version}
 eval $(sed -rn "/^configuration=/p" config.log)
+sed -ri 's@/usr/lib/X11/fonts@/usr/share/fonts@g;s@(/usr/)local/(info|share|lib)@\1\2@;s@\$VERSION@%{version}@g;s@\$ARCH@'${configuration}'@g' doc/man/emacs.1
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}
 install -m 0755 emacs-nox %{buildroot}%{_bindir}
diff --git a/site-lisp.tar.bz2 b/site-lisp.tar.bz2
index 14b1d43..587491b 100644
--- a/site-lisp.tar.bz2
+++ b/site-lisp.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1d2ebbc40bd8a9d89fdf72ceb92465087fc803567c65259bd884cfa33c11dbc
-size 51806
+oid sha256:e11f605a7aafbbf54997dc76da25efb86273d43df75dd718bb8e24749077e1f6
+size 52106