Accepting request 578040 from home:keichwa:branches:Publishing

- Stop loading psgml automatically because of conflicts with js-mode.el;
  bsc#1080086.

OBS-URL: https://build.opensuse.org/request/show/578040
OBS-URL: https://build.opensuse.org/package/show/Publishing/psgml?expand=0&rev=16
This commit is contained in:
OBS User mrdocs 2018-02-20 02:01:09 +00:00 committed by Git OBS Bridge
parent 3a3cc8eeb3
commit 3e93c83a87
3 changed files with 31 additions and 12 deletions

View File

@ -1,3 +1,16 @@
Warning:
========
suse-start-psgml.el is no longer installed by default, and thus, psgml
does not start automatically because psgml now sometimes conflicts with
shipped Emacs modes such as js-mode.el. If you want to continue using
suse-start-psgml.el copy it to the site-lisp directory:
cp /usr/share/doc/packages/psgml/suse-start-psgml.el \
/usr/share/emacs/site-lisp/
------------------------------------------------------------------------
Patches:
========
@ -18,18 +31,17 @@ To compile psgml-dsssl.el, psgml-ja.tgz and psgml-xpointer.el
Configuration:
==============
Configuration is done /usr/share/emacs/site-lisp/suse-start-psgml.el;
The Emacs default installation on SuSE Linux make use of it
automatically. If you don't use
/usr/share/emacs/site-lisp/site-start.el coming with SuSE Linux add to
Configuration is done with suse-start-psgml.el in
/usr/share/emacs/site-lisp/ (see the Warning above where you can find it);
If you do not use
/usr/share/emacs/site-lisp/site-start.el coming with SUSE Linux add to
your ~/.emacs:
(load "suse-start-psgml")
or copy the contents of /usr/share/emacs/site-lisp/suse-start-psgml.el
to your ~/.emacs.
or copy the contents of suse-start-psgml.el to your ~/.emacs.
2001-07-16 12:48:21 CEST -ke-
Comments
--------
@ -45,5 +57,5 @@ mode: ke-docbook
End:
-->
2001-07-16 12:48:21 CEST -ke-

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 19 12:53:44 UTC 2018 - ke@suse.com
- Stop loading psgml automatically because of conflicts with js-mode.el;
bsc#1080086.
-------------------------------------------------------------------
Mon Dec 15 11:59:34 UTC 2014 - ke@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package psgml
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -129,8 +129,8 @@ make install prefix="$RPM_BUILD_ROOT%{_prefix}" \
make install-info prefix="$RPM_BUILD_ROOT%{_prefix}" \
lispdir="$RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/psgml" \
infodir="$RPM_BUILD_ROOT%{_infodir}"
install -p -m644 suse-start-psgml.el \
$RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
#install -p -m644 suse-start-psgml.el \
# $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
install -p -m644 iso88591.map \
$RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/psgml/iso88591.map
install -p -m644 tdtd-font.el tdtd-font.elc \
@ -165,9 +165,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README.psgml README.openSUSE
%doc README.xxml THANKS.xxml
%doc suse-start-psgml.el
%doc psgml-jade
%doc tdtd-readme.txt tdtd-tutorial.txt tdtd.dot.emacs
%config %{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
# %config %{_prefix}/share/emacs/site-lisp/suse-start-psgml.el
%{_prefix}/share/emacs/site-lisp/psgml
%doc %{_infodir}/psgml-api.info*
%doc %{_infodir}/psgml.info*