Accepting request 1116811 from editors

- For the at-spi bus the package at-spi2-core is required 
- Move eln prune code from ~/.gnu-emacs to site-start

- Avoid warnings about eln files as well as prune older eln files 

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

OBS-URL: https://build.opensuse.org/request/show/1116811
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/emacs?expand=0&rev=178

dot.gnu-emacs

@@ -543,5 +543,6 @@
 ;; Use minibuffer for aking GPG passphrase
 ;;(setq epa-pinentry-mode 'loopback)
 ;;(pinentry-start)
+;;
 ;;;;;;;;;;
 ;; the end

emacs.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Oct 10 11:36:25 UTC 2023 - Dr. Werner Fink <werner@suse.de>
+
+- For the at-spi bus the package at-spi2-core is required 
+- Move eln prune code from ~/.gnu-emacs to site-start
+
+-------------------------------------------------------------------
+Mon Oct  9 08:41:27 UTC 2023 - Dr. Werner Fink <werner@suse.de>
+
+- Avoid warnings about eln files as well as prune older eln files 
+
+-------------------------------------------------------------------
+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

@@ -127,6 +127,7 @@ BuildRequires:  libacl-devel
 %if %{with nativecomp}
 BuildRequires:  libgccjit-devel
 %endif
+BuildRequires:  pkgconfig(atspi-2)
 BuildRequires:  pkgconfig(jansson)
 BuildRequires:  pkgconfig(json)
 BuildRequires:  pkgconfig(lcms2)
@@ -183,6 +184,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
@@ -233,7 +236,7 @@ This package requires emacs-x11 and/or emacs-nox to have the GNU Emacs editor it
 Requires(post): fileutils
 Requires:       emacs = %{version}-%{release}
 %if %{with nativecomp}
-Requires:       emacs-eln = %{version}
+Requires:       emacs-eln = %{version}-%{release}
 %endif
 Provides:       emacs_program = %{version}-%{release}
 Summary:        GNU Emacs-nox: An Emacs Binary without X Window System Support
@@ -250,9 +253,10 @@ Love it or leave it.
 Requires(post): fileutils
 Requires:       emacs = %{version}-%{release}
 %if %{with nativecomp}
-Requires:       emacs-eln = %{version}
+Requires:       emacs-eln = %{version}-%{release}
 %endif
 Provides:       emacs_program = %{version}-%{release}
+Requires:       at-spi2-core
 Requires:       gnu-unifont-bitmap-fonts
 Requires:       ifnteuro
 Requires:       xorg-x11-fonts
@@ -644,6 +648,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 +765,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 +5104,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