commit psgml for openSUSE:Factory
Hello community,
here is the log from the commit of package psgml for openSUSE:Factory checked
in at 2020-08-18 15:36:48
Comparing /work/SRC/openSUSE:Factory/psgml (Old)
and /work/SRC/openSUSE:Factory/.psgml.new.3399 (New)
Package is "psgml"
Tue Aug 18 15:36:48 2020 rev:25 rq:827586 version:1.4.1
Changes:
--- /work/SRC/openSUSE:Factory/psgml/psgml.changes 2019-11-26
17:02:13.636051055 +0100
+++ /work/SRC/openSUSE:Factory/.psgml.new.3399/psgml.changes2020-08-18
15:36:49.804681253 +0200
@@ -1,0 +2,7 @@
+Tue Aug 18 11:19:51 UTC 2020 - Dr. Werner Fink
+
+- Add patch bugzilla-1175274-emacs-27.1.patch
+ There is no (process-kill-without-query) anymore, use
+ (set-process-query-on-exit-flag) instead (boo#1175274).
+
+---
New:
bugzilla-1175274-emacs-27.1.patch
Other differences:
--
++ psgml.spec ++
--- /var/tmp/diff_new_pack.FVE62u/_old 2020-08-18 15:36:50.800681665 +0200
+++ /var/tmp/diff_new_pack.FVE62u/_new 2020-08-18 15:36:50.804681667 +0200
@@ -1,7 +1,7 @@
#
# spec file for package psgml
#
-# Copyright (c) 2019 SUSE LLC.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -48,6 +48,7 @@
Patch7: xxml-indentation.diff
Patch8: flavour.patch
Patch9: psgml-texinfo-6.7.patch
+Patch10:bugzilla-1175274-emacs-27.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
URL:http://sourceforge.net/projects/psgml/
@@ -102,6 +103,7 @@
cp -p %{S:9} .
%patch -p 1 -P 6
%patch8
+%patch10 -p0
%build
./configure --prefix=%{_prefix} --infodir=%{_infodir}
++ bugzilla-1175274-emacs-27.1.patch ++
There is no (process-kill-without-query) anymore, use
(set-process-query-on-exit-flag) instead.
---
psgml-edit.el |2 +-
psgml-jade.el |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- psgml-edit.el
+++ psgml-edit.el 2020-08-18 11:37:26.469311227 +
@@ -1974,7 +1974,7 @@ characters in the current coding system.
(process (start-process
(format "%s background" handler)
nil handler file)))
- (process-kill-without-query process
+ (set-process-query-on-exit-flag process nil
(error "Don't know how to handle notation '%s'." notation)))
(text (progn
--- psgml-jade.el
+++ psgml-jade.el 2020-08-18 11:37:36.901126421 +
@@ -347,7 +347,7 @@ by EXTENSION, if non-nil."
(erase-buffer)
(let ((process (start-process (concat name " background")
nil "/bin/sh" "-c" command)))
-(process-kill-without-query process
+(set-process-query-on-exit-flag process nil
(defun sgml-run-command (name command file error-regexp)
"Hook for `sgml-command-list'."
commit psgml for openSUSE:Factory
Hello community,
here is the log from the commit of package psgml for openSUSE:Factory checked
in at 2019-11-26 17:01:45
Comparing /work/SRC/openSUSE:Factory/psgml (Old)
and /work/SRC/openSUSE:Factory/.psgml.new.26869 (New)
Package is "psgml"
Tue Nov 26 17:01:45 2019 rev:24 rq:750783 version:1.4.1
Changes:
--- /work/SRC/openSUSE:Factory/psgml/psgml.changes 2018-07-24
17:25:20.087525861 +0200
+++ /work/SRC/openSUSE:Factory/.psgml.new.26869/psgml.changes 2019-11-26
17:02:13.636051055 +0100
@@ -1,0 +2,6 @@
+Mon Nov 25 14:59:06 UTC 2019 - Dominique Leuenberger
+
+- Add psgml-texinfo-6.7.patch: Fix build with texinfo 6.7, which
+ defaults to UTF-8 unless differently specified.
+
+---
New:
psgml-texinfo-6.7.patch
Other differences:
--
++ psgml.spec ++
--- /var/tmp/diff_new_pack.spLRf5/_old 2019-11-26 17:02:14.656050718 +0100
+++ /var/tmp/diff_new_pack.spLRf5/_new 2019-11-26 17:02:14.660050717 +0100
@@ -1,7 +1,7 @@
#
# spec file for package psgml
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -25,7 +25,7 @@
%define tdtd tdtd.zip
Requires: emacs_program
Summary:Emacs Add-On to edit SGML/XML documents
-License:GPL-2.0+ and SUSE-Public-Domain
+License:GPL-2.0-or-later AND SUSE-Public-Domain
Group: Productivity/Editors/Emacs
Version:1.4.1
Release:0
@@ -47,9 +47,10 @@
Patch6: tdtd-dtd-patch
Patch7: xxml-indentation.diff
Patch8: flavour.patch
+Patch9: psgml-texinfo-6.7.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
-Url:http://sourceforge.net/projects/psgml/
+URL:http://sourceforge.net/projects/psgml/
PreReq: %install_info_prereq
%description
@@ -77,6 +78,7 @@
%prep
%setup -q
%patch -p1
+%patch9 -p1
cp -p %{SOURCE1} .
# xxml
mkdir xxml
@@ -154,7 +156,7 @@
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/psgml-api.info.gz
-%postun
+%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/psgml-api.info.gz
@@ -168,7 +170,7 @@
%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*
++ psgml-texinfo-6.7.patch ++
diff -ur psgml-1.4.1.orig/psgml.texi psgml-1.4.1/psgml.texi
--- psgml-1.4.1.orig/psgml.texi 2013-07-27 15:03:45.0 +0200
+++ psgml-1.4.1/psgml.texi 2019-11-25 15:57:56.928114579 +0100
@@ -1,4 +1,5 @@
\input texinfo @c -*-texinfo-*-
+@documentencoding ISO-8859-1
@c %**start of header
@setfilename psgml.info
@settitle psgml
commit psgml for openSUSE:Factory
Hello community,
here is the log from the commit of package psgml for openSUSE:Factory checked
in at 2018-07-24 17:25:16
Comparing /work/SRC/openSUSE:Factory/psgml (Old)
and /work/SRC/openSUSE:Factory/.psgml.new (New)
Package is "psgml"
Tue Jul 24 17:25:16 2018 rev:23 rq:624795 version:1.4.1
Changes:
--- /work/SRC/openSUSE:Factory/psgml/psgml.changes 2018-02-20
17:56:05.552266704 +0100
+++ /work/SRC/openSUSE:Factory/.psgml.new/psgml.changes 2018-07-24
17:25:20.087525861 +0200
@@ -1,0 +2,11 @@
+Mon Jul 23 13:20:56 UTC 2018 - k...@suse.com
+
+- In comments, escape macros.
+- Stop compiling tdtd-font-maker.el (do not needed at run-time).
+
+---
+Tue Jul 17 10:54:23 UTC 2018 - k...@suse.com
+
+- Run emacs with -Q (instead of --no-site).
+
+---
Other differences:
--
++ psgml.spec ++
--- /var/tmp/diff_new_pack.oY8apY/_old 2018-07-24 17:25:20.619526539 +0200
+++ /var/tmp/diff_new_pack.oY8apY/_new 2018-07-24 17:25:20.619526539 +0200
@@ -105,14 +105,14 @@
./configure --prefix=%{_prefix} --infodir=%{_infodir}
make # emacs
echo "(add-to-list (quote load-path) (getenv \"PWD\"))" > load-psgml.el
-emacs --batch --no-site -l load-psgml.el \
+emacs --batch -Q -l load-psgml.el \
-l ./tdtd-font.el \
- -f batch-byte-compile tdtd-font.el tdtd-font-maker.el tdtd.el
-emacs --batch --no-site -l load-psgml.el -f batch-byte-compile xxml.el
-emacs --batch --no-site -l load-psgml.el -l ./xxml.el \
+ -f batch-byte-compile tdtd-font.el tdtd.el
+emacs --batch -Q -l load-psgml.el -f batch-byte-compile xxml.el
+emacs --batch -Q -l load-psgml.el -l ./xxml.el \
-f batch-byte-compile ke-docbook.el
-emacs --batch --no-site -l load-psgml.el -f batch-byte-compile
psgml-xpointer.el
-emacs --batch --no-site -l load-psgml.el -l tempo -f batch-byte-compile
psgml-html.el
+emacs --batch -Q -l load-psgml.el -f batch-byte-compile psgml-xpointer.el
+emacs --batch -Q -l load-psgml.el -l tempo -f batch-byte-compile psgml-html.el
makeinfo psgml.texi
makeinfo psgml-api.texi
@@ -130,11 +130,11 @@
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
+#$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 \
- tdtd-font-maker.el tdtd-font-maker.elc \
+ tdtd-font-maker.el \
tdtd.el tdtd.elc \
$RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/psgml/
install -p -m644 xxml.el xxml.elc \
@@ -168,7 +168,7 @@
%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*
commit psgml for openSUSE:Factory
Hello community,
here is the log from the commit of package psgml for openSUSE:Factory checked
in at 2018-02-20 17:55:58
Comparing /work/SRC/openSUSE:Factory/psgml (Old)
and /work/SRC/openSUSE:Factory/.psgml.new (New)
Package is "psgml"
Tue Feb 20 17:55:58 2018 rev:22 rq:578221 version:1.4.1
Changes:
--- /work/SRC/openSUSE:Factory/psgml/psgml.changes 2014-12-16
14:50:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.psgml.new/psgml.changes 2018-02-20
17:56:05.552266704 +0100
@@ -1,0 +2,6 @@
+Mon Feb 19 12:53:44 UTC 2018 - k...@suse.com
+
+- Stop loading psgml automatically because of conflicts with js-mode.el;
+ bsc#1080086.
+
+---
Other differences:
--
++ psgml.spec ++
--- /var/tmp/diff_new_pack.iVKFhA/_old 2018-02-20 17:56:07.296203911 +0100
+++ /var/tmp/diff_new_pack.iVKFhA/_new 2018-02-20 17:56:07.300203766 +0100
@@ -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-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 @@
%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*
++ psgml-README.openSUSE ++
--- /var/tmp/diff_new_pack.iVKFhA/_old 2018-02-20 17:56:07.408199878 +0100
+++ /var/tmp/diff_new_pack.iVKFhA/_new 2018-02-20 17:56:07.408199878 +0100
@@ -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 @@
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 @@
End:
-->
-2001-07-16 12:48:21 CEST -ke-
+
commit psgml for openSUSE:Factory
Hello community,
here is the log from the commit of package psgml for openSUSE:Factory checked
in at 2014-12-16 14:49:26
Comparing /work/SRC/openSUSE:Factory/psgml (Old)
and /work/SRC/openSUSE:Factory/.psgml.new (New)
Package is psgml
Changes:
--- /work/SRC/openSUSE:Factory/psgml/psgml.changes 2012-09-17
16:59:09.0 +0200
+++ /work/SRC/openSUSE:Factory/.psgml.new/psgml.changes 2014-12-16
14:50:19.0 +0100
@@ -1,0 +2,7 @@
+Mon Dec 15 11:59:34 UTC 2014 - k...@suse.de
+
+- Update from https://marmalade-repo.org/packages/psgml-1.4.1.tar;
+ bnc#909627.
+- Cleanup spec file.
+
+---
Old:
psgml-1.3.2.tar.gz
psgml-README.SuSE
New:
psgml-1.4.1.tar
psgml-README.openSUSE
Other differences:
--
++ psgml.spec ++
--- /var/tmp/diff_new_pack.yRp0Nm/_old 2014-12-16 14:50:24.0 +0100
+++ /var/tmp/diff_new_pack.yRp0Nm/_new 2014-12-16 14:50:24.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package psgml
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,16 +27,15 @@
Summary:Emacs Add-On to edit SGML/XML documents
License:GPL-2.0+ and SUSE-Public-Domain
Group: Productivity/Editors/Emacs
-Version:1.3.2
+Version:1.4.1
Release:0
-# Source:
http://belnet.dl.sourceforge.net/sourceforge/psgml/psgml-%{version}.tar.bz2
-Source: ftp://ftp.lysator.liu.se/pub/sgml/ALPHA/psgml-%{version}.tar.gz
+Source: https://marmalade-repo.org/packages/psgml-%{version}.tar
Source1:http://home.sprynet.com/sprynet/dmeggins/psgml-dsssl.el
Source2:http://logimac.mathematik.uni-freiburg.de/mixed/psgml-ja.tgz
Source3:http://www.menteith.com/tdtd/data/tdtd.zip
Source4:http://www.iro.umontreal.ca/~pinard/xxml/xxml.tar.gz
Source5:http://www.megginson.com/Software/psgml-xpointer.el
-Source6:%{name}-README.SuSE
+Source6:%{name}-README.openSUSE
Source7:ke-docbook.el
Source8:suse-start-psgml.el
Source9:psgml-html.el
@@ -60,7 +59,7 @@
Included are several helper tools: tdtd, xxml, psgml-xpointer.
-For more info see README.SuSE.
+For more info see README.openSUSE.
Compiled for GNU Emacs (XEmacs has its own version!).
@@ -72,7 +71,8 @@
Lennart Staflin le...@lysator.liu.se
David Megginson dmegg...@sprynet.com
Matthias Clasen mcla...@sun2.mathematik.uni-freiburg.de
-Fran�ois Pinard pin...@iro.umontreal.ca
+François Pinard pin...@iro.umontreal.ca
+etc.
%prep
%setup -q
@@ -94,7 +94,7 @@
unzip -o -a %{SOURCE3}
# Add write permissions so that we can patch it
chmod u+w tutorial.txt
-cp -p %{SOURCE6} README.SuSE
+cp -p %{SOURCE6} README.openSUSE
cp -p %{SOURCE7} .
cp -p %{SOURCE8} .
cp -p %{S:9} .
@@ -163,7 +163,7 @@
%files
%defattr(644,root,root,755)
-%doc INSTALL README.psgml README.SuSE
+%doc README.psgml README.openSUSE
%doc README.xxml THANKS.xxml
%doc psgml-jade
%doc tdtd-readme.txt tdtd-tutorial.txt tdtd.dot.emacs
++ flavour.patch ++
--- /var/tmp/diff_new_pack.yRp0Nm/_old 2014-12-16 14:50:24.0 +0100
+++ /var/tmp/diff_new_pack.yRp0Nm/_new 2014-12-16 14:50:24.0 +0100
@@ -9,37 +9,6 @@
(let ((default-directory psgml-source-dir)
(load-path (cons psgml-source-dir load-path)))
(mapcar (function psgml-byte-compile-file)
psgml-parse.el
-+++ psgml-parse.el 2012-07-02 13:03:42.892010400 +
-@@ -440,7 +440,7 @@ Applicable to XML.)
- ;; set of moves: list of moves
-
- (defmacro sgml-add-move-to-set (token node set)
-- (`(cons (cons (, token) (, node)) (, set
-+ `(cons (cons ,token ,node) , set))
-
- (defmacro sgml-moves-lookup (token set)
- (` (assq (, token) (, set
-@@ -460,7 +460,7 @@ Applicable to XML.)
- (` (cddr (, s
-
- (defmacro sgml-state-final-p (s)
-- (`(null (sgml-state-reqs (, s)
-+ `(null (sgml-state-reqs ,s)))
-
- ;; adding moves
- ;; *** Should these functions check for ambiguity?
-@@ -904,8 +904,8 @@ If ATTSPEC is nil, nil is returned.
- (cons
-'progn
-(loop for n in names collect
-- (`(defmacro (, (intern (format sgml-eltype-%s n))) (et)
-- (list 'get et ''(, n)))
-+ `(defmacro ,(intern (format sgml-eltype-%s n)) (et)
-+ (list 'get et '',n)
-
- (sgml-prop-fields
- ;;flags ; optional tags and mixed
--- xxml.el
+++ xxml.el2012-07-02 12:28:42.168509922 +
@@ -293,7
commit psgml for openSUSE:Factory
Hello community,
here is the log from the commit of package psgml for openSUSE:Factory checked
in at 2012-09-17 16:59:00
Comparing /work/SRC/openSUSE:Factory/psgml (Old)
and /work/SRC/openSUSE:Factory/.psgml.new (New)
Package is psgml, Maintainer is k...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/psgml/psgml.changes 2012-07-02
21:33:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.psgml.new/psgml.changes 2012-09-17
16:59:09.0 +0200
@@ -1,0 +2,5 @@
+Sat Sep 15 10:33:34 UTC 2012 - idon...@suse.com
+
+- Add BuildRequires on makeinfo to fix Factory build
+
+---
Other differences:
--
++ psgml.spec ++
--- /var/tmp/diff_new_pack.nMp0fG/_old 2012-09-17 16:59:13.0 +0200
+++ /var/tmp/diff_new_pack.nMp0fG/_new 2012-09-17 16:59:13.0 +0200
@@ -15,19 +15,20 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: psgml
-BuildRequires: emacs-nox unzip
+BuildRequires: emacs-nox
+%if 0%{?suse_version} 1220
+BuildRequires: makeinfo
+%endif
+BuildRequires: unzip
%define tdtd tdtd.zip
-License:GPL-2.0+ ; SUSE-Public-Domain
-Group: Productivity/Editors/Emacs
Requires: emacs_program
-AutoReqProv:on
Summary:Emacs Add-On to edit SGML/XML documents
+License:GPL-2.0+ and SUSE-Public-Domain
+Group: Productivity/Editors/Emacs
Version:1.3.2
-Release:244
+Release:0
# Source:
http://belnet.dl.sourceforge.net/sourceforge/psgml/psgml-%{version}.tar.bz2
Source: ftp://ftp.lysator.liu.se/pub/sgml/ALPHA/psgml-%{version}.tar.gz
Source1:http://home.sprynet.com/sprynet/dmeggins/psgml-dsssl.el
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit psgml for openSUSE:Factory
Hello community,
here is the log from the commit of package psgml for openSUSE:Factory checked
in at 2012-07-02 21:33:03
Comparing /work/SRC/openSUSE:Factory/psgml (Old)
and /work/SRC/openSUSE:Factory/.psgml.new (New)
Package is psgml, Maintainer is k...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/psgml/psgml.changes 2011-09-23
12:42:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.psgml.new/psgml.changes 2012-07-02
21:33:04.0 +0200
@@ -1,0 +2,6 @@
+Mon Jul 2 13:04:56 UTC 2012 - wer...@suse.de
+
+- Add fix for new emacs 24.1, compare with
+ https://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00259.html
+
+---
New:
flavour.patch
Other differences:
--
++ psgml.spec ++
--- /var/tmp/diff_new_pack.zuFzBm/_old 2012-07-02 21:33:06.0 +0200
+++ /var/tmp/diff_new_pack.zuFzBm/_new 2012-07-02 21:33:06.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package psgml (Version 1.3.2)
+# spec file for package psgml
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,6 +46,7 @@
Patch5: psgml-xxml-namespace-face.diff
Patch6: tdtd-dtd-patch
Patch7: xxml-indentation.diff
+Patch8: flavour.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Url:http://sourceforge.net/projects/psgml/
@@ -97,6 +98,7 @@
cp -p %{SOURCE8} .
cp -p %{S:9} .
%patch -p 1 -P 6
+%patch8
%build
./configure --prefix=%{_prefix} --infodir=%{_infodir}
++ flavour.patch ++
--- psgml-maint.el
+++ psgml-maint.el 2012-07-02 12:28:34.284377856 +
@@ -78,7 +78,7 @@
(defun psgml-compile-files ()
Compile the PSGML source files that needs compilation.
(interactive)
- (psgml-find-source-dir (interactive-p))
+ (psgml-find-source-dir (called-interactively-p))
(let ((default-directory psgml-source-dir)
(load-path (cons psgml-source-dir load-path)))
(mapcar (function psgml-byte-compile-file)
--- psgml-parse.el
+++ psgml-parse.el 2012-07-02 13:03:42.892010400 +
@@ -440,7 +440,7 @@ Applicable to XML.)
;; set of moves: list of moves
(defmacro sgml-add-move-to-set (token node set)
- (`(cons (cons (, token) (, node)) (, set
+ `(cons (cons ,token ,node) , set))
(defmacro sgml-moves-lookup (token set)
(` (assq (, token) (, set
@@ -460,7 +460,7 @@ Applicable to XML.)
(` (cddr (, s
(defmacro sgml-state-final-p (s)
- (`(null (sgml-state-reqs (, s)
+ `(null (sgml-state-reqs ,s)))
;; adding moves
;; *** Should these functions check for ambiguity?
@@ -904,8 +904,8 @@ If ATTSPEC is nil, nil is returned.
(cons
'progn
(loop for n in names collect
-(`(defmacro (, (intern (format sgml-eltype-%s n))) (et)
-(list 'get et ''(, n)))
+`(defmacro ,(intern (format sgml-eltype-%s n)) (et)
+(list 'get et '',n)
(sgml-prop-fields
;;flags ; optional tags and mixed
--- xxml.el
+++ xxml.el 2012-07-02 12:28:42.168509922 +
@@ -293,7 +293,7 @@ Use nil to silence all progress.)
(defun xxml-version ()
Identifies the current version of this module.
(interactive)
- (if (interactive-p)
+ (if (called-interactively-p)
(message xxml-version)
xxml-version))
--- xxml/xxml.el
+++ xxml/xxml.el2012-07-02 12:28:38.396510520 +
@@ -293,7 +293,7 @@ Use nil to silence all progress.)
(defun xxml-version ()
Identifies the current version of this module.
(interactive)
- (if (interactive-p)
+ (if (called-interactively-p)
(message xxml-version)
xxml-version))
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit psgml for openSUSE:Factory
Hello community, here is the log from the commit of package psgml for openSUSE:Factory checked in at 2011-12-06 18:53:24 Comparing /work/SRC/openSUSE:Factory/psgml (Old) and /work/SRC/openSUSE:Factory/.psgml.new (New) Package is psgml, Maintainer is k...@suse.com Changes: Other differences: -- ++ psgml.spec ++ --- /var/tmp/diff_new_pack.l2Ogo6/_old 2011-12-06 19:26:36.0 +0100 +++ /var/tmp/diff_new_pack.l2Ogo6/_new 2011-12-06 19:26:36.0 +0100 @@ -21,7 +21,7 @@ Name: psgml BuildRequires: emacs-nox unzip %define tdtd tdtd.zip -License:GPLv2+ ; Public Domain, Freeware +License:GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Editors/Emacs Requires: emacs_program AutoReqProv:on -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
