Accepting request 316942 from Publishing

OBS-URL: https://build.opensuse.org/request/show/316942
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sgml-skel?expand=0&rev=19

sgml-skel.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jul 15 13:08:00 UTC 2015 - ke@suse.com
+
+- only create suse-catalog.xml at installation time; not in the update case.
+- Add Requires(post): libxml2-tools for xmlcatalog.
+
+-------------------------------------------------------------------
+Tue Jul 14 14:37:24 UTC 2015 - ke@suse.de
+
+- %post: create %{_sysconfdir}/xml/suse-catalog.xml to avoid validation
+  errors if in case no other DTD is installed [bsc#936596].
+
 -------------------------------------------------------------------
 Sun Nov 30 01:21:00 UTC 2014 - Led <ledest@gmail.com>
 

sgml-skel.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package sgml-skel
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -25,12 +25,12 @@ Group:          Productivity/Publishing/SGML
 Version:        0.6
 Release:        0
 Requires:       libxml2
+Requires(post): libxml2-tools
 PreReq:         /bin/awk
 PreReq:         /bin/mv
 PreReq:         /bin/chmod
 # URL: 
 Source0:        http://www.suse.de/~ke/%{name}/%{name}-%{version}.tar.bz2
-# :pserver:anoncvs@sources.redhat.com:/cvs/docbook-tools
 Source1:        docbook-tools/sgml-common/bin/install-catalog.in
 Source2:        edit-xml-catalog.sh
 Patch:          sgml-skel-regcat.diff
@@ -90,6 +90,14 @@ xmlcatalog --noout --add  "nextCatalog" "suse-catalog.xml" "suse-catalog.xml" \
 %clean
 rm -fr $RPM_BUILD_ROOT
 
+%post
+# only create suse-catalog.xml at installation time; not in the update case
+if [ "$1" = 1 ]; then
+  [ -r %{_sysconfdir}/xml/suse-catalog.xml ] \
+    || xmlcatalog --create  | sed 's:/>:>\
+</catalog>:' >%{_sysconfdir}/xml/suse-catalog.xml
+fi
+
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING NEWS README*