Accepting request 1116227 from home:Thaodan:branches:editors

- Add packaging macros for Emacs packages
- Add site-lisp directory for dynamic modules

OBS-URL: https://build.opensuse.org/request/show/1116227
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=364

emacs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  6 22:37:59 UTC 2023 - Björn Bidar <bjorn.bidar@thaodan.de>
+
+- Add packaging macros for Emacs packages
+- Add site-lisp directory for dynamic modules
+
 -------------------------------------------------------------------
 Thu Sep 28 11:53:14 UTC 2023 - Dr. Werner Fink <werner@suse.de>
 

emacs.spec

@@ -183,6 +183,8 @@ Source7:        %{name}.keyring
 %if %{without tex4pdf}
 Source8:        emacs-%{version}-pdf.tar.xz
 %endif
+Source9:        macros.emacs
+%{load:%{SOURCE9}}
 Patch0:         emacs-29.1.dif
 # Currently disabled
 Patch2:         emacs-24.4-glibc.patch
@@ -644,6 +646,13 @@ install -m 0644 %{S:3} %{buildroot}/etc/skel/.gnu-emacs
 mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d
 tar cf - site-lisp/ | tar xvvf - -C %{buildroot}%{_datadir}/emacs/
 chmod -R a+r %{buildroot}%{_datadir}/emacs/site-lisp/
+
+install -dm755 %{buildroot}/%{_emacs_sitestartdir}/
+cat << EOF > %{buildroot}/%{_emacs_sitestartdir}/archsitedir.el
+;; Add load-path for dynamic modules
+(add-to-list 'load-path "%{_emacs_archsitelispdir}")
+EOF
+
 popd
 (cd %{buildroot}
  find usr/share/emacs/site-lisp/ -type f	\
@@ -754,6 +763,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives
 ln -sf %{_sysconfdir}/alternatives/ctags		%{buildroot}%{_bindir}/ctags
 ln -sf %{_sysconfdir}/alternatives/ctags.1%{ext_man}	%{buildroot}%{_mandir}/man1/ctags.1%{ext_man}
 
+install -Dm644 %{SOURCE9} %{buildroot}%{_rpmmacrodir}/macros.emacs
+
 %if %{with nativecomp}
 touch eln.list
 for eln in %{buildroot}%{_libdir}/emacs/%{version}/native-lisp/%{version}-*/*.eln
@@ -5091,6 +5102,7 @@ fi
 %{_datadir}/emacs/%{version}/lisp/xt-mouse.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/xwidget.el%{ext_el}
 %{_datadir}/emacs/%{version}/lisp/yank-media.el%{ext_el}
+%{_rpmmacrodir}/macros.emacs
 
 %files -n etags
 %defattr(-,root,root)

macros.emacs

@@ -0,0 +1,5 @@
+# -*- rpm-spec -*-
+%_emacs_sitelispdir %{_datadir}/emacs/site-lisp
+%_emacs_etcdir %{_datadir}/emacs/etc
+%_emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d
+%_emacs_archsitelispdir %{_libdir}/emacs/site-lisp