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

Accepting request 1186609 from editors

Browse Source 
- Support system wide ELPA and MELPA site lisp paths
- Move post scriptlets for font-latex to emacs-auctex as
  triggerin scriptlets

OBS-URL: https://build.opensuse.org/request/show/1186609
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=188
This commit is contained in:
Ana Guerrero 2024-07-11 18:29:26 +00:00 committed by Git OBS Bridge
commit 2380abe256
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dot.gnu-emacs
View File

@ -358,12 +358,6 @@
(if (or (> major 11) (and (eq major 11) (>= minor 86)))
(custom-set-default 'TeX-master nil)
(setq-default TeX-master nil)))
; ; Users private libaries
; (if (boundp 'AUCTeX-version)
; (progn
; (setq TeX-macro-private '("~/lib/tex-lib/"))
; (setq TeX-style-private "~/lib/site-lisp/auctex/style/") ; AUC-TeX-Macros
; (setq TeX-auto-private "~/lib/site-lisp/auctex/auto/"))) ; Autom. Auc-TeX-Macros
(if (and window-system (featurep 'font-lock))
(progn
(add-hook 'latex-mode-hook 'turn-on-font-lock)
@ -371,7 +365,7 @@
(progn
(add-hook 'LaTeX-mode-hook 'turn-on-font-lock)
(add-hook 'LaTeX-mode-hook 'LaTeX-math-mode)
(add-hook 'after-init-hook #'(lambda () (load "auctex/font-latex" nil t)))))))
(add-hook 'after-init-hook #'(lambda () (load "font-latex" nil t)))))))
))
;;

7
emacs.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jul 10 08:54:22 UTC 2024 - Dr. Werner Fink <werner@suse.de>
- Support system wide ELPA and MELPA site lisp paths
- Move post scriptlets for font-latex to emacs-auctex as
triggerin scriptlets
-------------------------------------------------------------------
Tue Jul 2 07:52:23 UTC 2024 - Dr. Werner Fink <werner@suse.de>

30
emacs.spec
View File

@ -737,6 +737,10 @@ find %{buildroot}%{_datadir}/emacs/%{version}/etc/ -name '*[a-z].[16]' | \
rm -vf %{buildroot}%{_datadir}/emacs/%{version}/lisp/COPYING
ln -sf ../etc/COPYING \
%{buildroot}%{_datadir}/emacs/%{version}/lisp/COPYING
# Support system wide ELPA/MELPA
mkdir -p %{buildroot}%{_libdir}/emacs/elpa
mkdir -p %{buildroot}%{_datadir}/emacs/%{version}/site-lisp/elpa
mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/elpa
#
fdupes -q -r -1 %{buildroot}%{_datadir}/emacs/%{version}/etc/images/icons/ %{buildroot}%{_datadir}/icons/ |\
xargs -n 2 | while read first second; do
@ -800,27 +804,7 @@ make check
%pre
test -L usr/bin/emacs && rm -f usr/bin/emacs || true
%post -n emacs-nox
if test -e usr/share/emacs/site-lisp/auctex/font-latex.elc ; then
owd=$(pwd)
cd usr/share/emacs/site-lisp/auctex || exit 1
emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path)
byte-compile-warnings nil
TeX-lisp-directory "<none>"
TeX-auto-global "<none>")' -f batch-byte-compile font-latex.el > /dev/null 2>&1
cd $owd
fi
%post -n emacs-x11
if test -e usr/share/emacs/site-lisp/auctex/font-latex.elc ; then
owd=$(pwd)
cd usr/share/emacs/site-lisp/auctex || exit 1
emacs -batch -no-site-file -no-init-file --eval '(setq load-path (cons "." load-path)
byte-compile-warnings nil
TeX-lisp-directory "<none>"
TeX-auto-global "<none>")' -f batch-byte-compile font-latex.el > /dev/null 2>&1
cd $owd
fi
%glib2_gsettings_schema_post
%postun -n emacs-x11
@ -860,6 +844,10 @@ fi
%{_bindir}/ebrowse
%{_bindir}/emacs
%{_bindir}/emacsclient
%if %{without nativecomp}
%dir %{_libdir}/emacs/
%endif
%dir %{_libdir}/emacs/elpa/
%dir %{_libexecdir}/emacs/
%dir %{_libexecdir}/emacs/%{version}/
%dir %{_libexecdir}/emacs/%{version}/*-suse-linux*/
@ -3474,6 +3462,7 @@ fi
%{_datadir}/emacs/%{version}/lisp/xwidget.elc
%{_datadir}/emacs/%{version}/lisp/yank-media.elc
%dir %{_datadir}/emacs/%{version}/site-lisp/
%dir %{_datadir}/emacs/%{version}/site-lisp/elpa/
%{_datadir}/emacs/%{version}/site-lisp/subdirs.el
%dir %{_datadir}/emacs/%{version}/site-lisp/term/
%{_datadir}/emacs/%{version}/site-lisp/term/func-keys.el
@ -3482,6 +3471,7 @@ fi
%{_datadir}/emacs/%{version}/site-lisp/term/linux.el
%{_datadir}/emacs/%{version}/site-lisp/term/locale.el
%dir %{_datadir}/emacs/site-lisp/
%dir %{_datadir}/emacs/site-lisp/elpa/
%dir %{_datadir}/emacs/site-lisp/site-start.d/
%{_mandir}/man1/*.1%{ext_man}
%exclude %{_mandir}/man1/*tags.1%{ext_man}