rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

Accepting request 1113563 from home:Thaodan:branches:editors

Browse Source 
- 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
This commit is contained in:
Dr. Werner Fink 2023-09-26 06:36:13 +00:00 committed by Git OBS Bridge
parent 57d068c042
commit 5135be84ea
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emacs.changes
View File

@ -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>

21
emacs.spec
View File

@ -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