From 5135be84eadd1df97238fbe37a5cb4a86151c253a3a7cf66925b7d384d97a319 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 26 Sep 2023 06:36:13 +0000
Subject: [PATCH] Accepting request 1113563 from home:Thaodan:branches:editors

- Pass libdir to configure so native Emacs lisp files are installed
  correctly on 64bit systems

OBS-URL: https://build.opensuse.org/request/show/1113563
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=358
---
 emacs.changes |  6 ++++++
 emacs.spec    | 21 ++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/emacs.changes b/emacs.changes
index 9e83372..171ddb1 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 26 00:11:46 UTC 2023 - Björn Bidar <bjorn.bidar@thaodan.de>
+
+- Pass libdir to configure so native Emacs lisp files are installed
+  correctly on 64bit systems
+
 -------------------------------------------------------------------
 Fri Aug 11 10:33:54 UTC 2023 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/emacs.spec b/emacs.spec
index 81e51d0..4c612be 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -279,8 +279,6 @@ Requires:       emacs-el = %{version}
 Summary:        GNU Emacs-nox: Emacs Lisp native compiled binary files
 Group:          Productivity/Text/Editors
 
-%define _libeln %{_prefix}/lib
-
 %description -n emacs-eln
 Emacs Lisp (Elisp) is the Lisp dialect used by the Emacs text editor
 family. GNU Emacs can currently execute Elisp code either interpreted
@@ -444,6 +442,7 @@ export CC CFLAGS LANG LC_CTYPE LDFLAGS
 	 --sharedstatedir=%{_localstatedir}/lib \
 	 --libexecdir=%{_libexecdir} \
 	 --with-file-notification=yes \
+     --libdir=%{_libdir} \
 	 --enable-locallisppath=%{_datadir}/emacs/%{version}/site-lisp:%{_datadir}/emacs/site-lisp
 "
 DESKTOP="--with-x \
@@ -723,19 +722,19 @@ ln -sf %{_sysconfdir}/alternatives/ctags.1%{ext_man}	%{buildroot}%{_mandir}/man1
 
 %if %{with nativecomp}
 touch eln.list
-for eln in %{buildroot}%{_libeln}/emacs/%{version}/native-lisp/%{version}-*/*.eln
+for eln in %{buildroot}%{_libdir}/emacs/%{version}/native-lisp/%{version}-*/*.eln
 do
    if test -e $eln
    then
-	echo '%%{_libeln}/emacs/%%{version}/native-lisp/%%{version}-*/*.eln' >> eln.list
+	echo '%%{_libdir}/emacs/%%{version}/native-lisp/%%{version}-*/*.eln' >> eln.list
    fi
    break
 done
-for eln in %{buildroot}%{_libeln}/emacs/%{version}/native-lisp/%{version}-*/preloaded/*.eln
+for eln in %{buildroot}%{_libdir}/emacs/%{version}/native-lisp/%{version}-*/preloaded/*.eln
 do
    if test -e $eln
    then
-	echo '%%{_libeln}/emacs/%%{version}/native-lisp/%%{version}-*/preloaded/*.eln' >> eln.list
+	echo '%%{_libdir}/emacs/%%{version}/native-lisp/%%{version}-*/preloaded/*.eln' >> eln.list
    fi
    break
 done
@@ -3467,11 +3466,11 @@ fi
 %if %{with nativecomp}
 %files       -n emacs-eln -f eln.list
 %defattr(-, root, root)
-%dir %{_libeln}/emacs/
-%dir %{_libeln}/emacs/%{version}/
-%dir %{_libeln}/emacs/%{version}/native-lisp/
-%dir %{_libeln}/emacs/%{version}/native-lisp/%{version}-*/
-%dir %{_libeln}/emacs/%{version}/native-lisp/%{version}-*/preloaded/
+%dir %{_libdir}/emacs/
+%dir %{_libdir}/emacs/%{version}/
+%dir %{_libdir}/emacs/%{version}/native-lisp/
+%dir %{_libdir}/emacs/%{version}/native-lisp/%{version}-*/
+%dir %{_libdir}/emacs/%{version}/native-lisp/%{version}-*/preloaded/
 %endif
 
 %files       -n emacs-info