pdumper for all emacs layouts

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=281
This commit is contained in:
2020-08-14 08:04:15 +00:00
committed by Git OBS Bridge
parent 50e3f99392
commit 4f26b9fcbf
2 changed files with 25 additions and 8 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 14 08:01:27 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Provide for all three emacs layouts, that are emacs-nox, emacs-x11,
and emacs-gtk their own pdumper file (boo#1175233)
-------------------------------------------------------------------
Wed Aug 12 12:24:44 UTC 2020 - Dr. Werner Fink <werner@suse.de>

View File

@@ -507,23 +507,26 @@ make_mchkoff ()
ac_cv_lib_gif_EGifPutExtensionLast=yes
export ac_cv_lib_gif_EGifPutExtensionLast
CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS}
CFLAGS="$CFLAGS $SMALL" ./configure ${COMP} ${PREFIX} ${NOX11} ${SYS} --with-dumping=pdumper
make_mchkoff bootstrap
make -C lisp/ updates compile
for i in `find site-lisp/ -name '*.el'`; do
src/emacs -batch -q --no-site -f batch-byte-compile $i; \
done
cp src/emacs emacs-nox
cp src/emacs.pdmp emacs-nox.pdmp
make distclean
#
CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${GTK} ${SYS}
CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${GTK} ${SYS} --with-dumping=pdumper
make_mchkoff
cp src/emacs emacs-gtk
cp src/emacs.pdmp emacs-gtk.pdmp
make distclean
#
CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${X11} ${SYS}
CFLAGS="$CFLAGS $LARGE" ./configure ${COMP} ${PREFIX} ${X11} ${SYS} --with-dumping=pdumper
make_mchkoff
cp src/emacs emacs-x11
cp src/emacs.pdmp emacs-x11.pdmp
%if %{with tex4pdf}
#
@@ -542,12 +545,18 @@ popd
PATH=/sbin:$PATH
##
VERSION=%{version}
mkdir -p %{buildroot}/usr/bin
install -m 0755 emacs-nox %{buildroot}/usr/bin/
install -m 0755 emacs-gtk %{buildroot}/usr/bin/
install -m 0755 emacs-x11 %{buildroot}/usr/bin/
eval $(sed -rn "/^configuration=/p" config.log)
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}
install -m 0755 emacs-nox %{buildroot}%{_bindir}
install -m 0755 emacs-gtk %{buildroot}%{_bindir}
install -m 0755 emacs-x11 %{buildroot}%{_bindir}
install -m 0644 emacs-nox.pdmp %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}/
install -m 0644 emacs-gtk.pdmp %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}/
install -m 0644 emacs-x11.pdmp %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}/
make install DESTDIR=%{buildroot} systemdunitdir=%{_userunitdir}
rm -vf %{buildroot}/usr/bin/emacs
rm -vf %{buildroot}%{_prefix}/lib/emacs/%{version}/${configuration}/emacs.pdmp
install -p %{S:5} %{buildroot}/usr/bin/emacs
chmod 0755 %{buildroot}/usr/bin/emacs
tar cf - `find site-lisp/ -name '*.el' -o -name '*.elc'` | \
@@ -729,7 +738,6 @@ fi
%dir %{_prefix}/lib/emacs/
%dir %{_prefix}/lib/emacs/%{version}/
%dir %{_prefix}/lib/emacs/%{version}/*-suse-linux*/
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/emacs.pdmp
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/hexl
%if %{without mailutils}
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/movemail
@@ -3290,11 +3298,14 @@ fi
%files -n emacs-nox
%defattr(-, root, root)
%{_bindir}/emacs-nox
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/emacs-nox.pdmp
%files -n emacs-x11
%defattr(-, root, root)
%{_bindir}/emacs-x11
%{_bindir}/emacs-gtk
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/emacs-x11.pdmp
%{_prefix}/lib/emacs/%{version}/*-suse-linux*/emacs-gtk.pdmp
%dir %{appDefaultsDir}
%{appDefaultsFile}
%{_datadir}/applications/emacs.desktop