Accepting request 593155 from Publishing

OBS-URL: https://build.opensuse.org/request/show/593155
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docbook-xsl?expand=0&rev=2

dbxslt-install.sh

@@ -3,7 +3,7 @@
 # Installs the DocBook XSL Stylesheets on openSUSE systems
 #
 # Author: Thomas Schraitle
-# Copyright 2016-2017 toms@opensuse.org
+# Copyright 2016-2018 toms@opensuse.org
 #
 
 # set -x

docbook-xsl.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar 28 14:52:19 UTC 2018 - thomas.schraitle@suse.com
+
+- Spec file:
+  Missing 'g' in sed replacements of @VERSION@ of catalog files.
+  This is needed to avoid the string "@VERSION@" in our installed
+  catalog files. This leads to catalog resolution errors. 
+- Applied spec-cleaner
+
 -------------------------------------------------------------------
 Wed Nov 22 08:34:21 UTC 2017 - thomas.schraitle@suse.com
 

docbook-xsl.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl
 #
-# Copyright (c) 2017 SUSE LINUX 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
@@ -34,7 +34,7 @@ Release:        0
 Summary:        XSL Stylesheets for DocBook
 License:        MPL-1.1 AND MIT
 Group:          Productivity/Publishing/DocBook
-URL:            https://github.com/docbook/xslt10-stylesheets
+Url:            https://github.com/docbook/xslt10-stylesheets
 Source0:        https://github.com/docbook/xslt10-stylesheets/releases/download/release%%2F%{version}/docbook-xsl-%{version}.tar.bz2
 Source1:        https://github.com/docbook/xslt10-stylesheets/releases/download/release%%2F%{version}/docbook-xsl-doc-%{version}.tar.bz2
 Source2:        %{db4style_catalog}
@@ -114,12 +114,10 @@ Group:          Productivity/Publishing/XML
 Requires:       ImageMagick
 Requires:       perl
 
-
 %description   pdf2index
 
 Contains the script pdf2index which creates indices for FOP.
 
-
 %prep
 # %%setup -q -n docbook-xsl-%%{realversion} -b1
 %setup -q -c -T -n docbook-xsl
@@ -134,8 +132,8 @@ chmod +x $(basename %{SOURCE10}) $(basename %{SOURCE11})
 # Replace version in XML catalog files
 db4=$(basename %{SOURCE2})
 db5=$(basename %{SOURCE3})
-sed --in-place 's/@VERSION@/%{realversion}/' $db4
-sed --in-place 's/@VERSION@/%{realversion}/' $db5
+sed --in-place 's/@VERSION@/%{realversion}/g' $db4
+sed --in-place 's/@VERSION@/%{realversion}/g' $db5
 
 # Unpack stylesheet and doc sources into the correct directory:
 tar xf %{SOURCE0} -C docbook-xsl-%{realversion}-ns --strip-components 1
@@ -153,7 +151,6 @@ rm -rf extensions/*.py extensions/saxon65.jar extensions/xalan27.jar \
        extensions/build.xml epub/bin
 )
 
-
 %build
 pushd docbook-xsl-%{realversion}-ns
 
@@ -174,10 +171,9 @@ popd
 # Create the non-NS variant from the NS original source:
 ./xslnons-build docbook-xsl-%{realversion}-ns docbook-xsl-%{realversion}-nons
 
-
 %install
 mkdir -p %{buildroot}%{_sysconfdir}/xml/catalog.d \
-         %{buildroot}%rb_libdir/
+         %{buildroot}%{rb_libdir}/
 
 ./dbxslt-install.sh --debug --buildroot=%{buildroot} \
             --package-version=%{realversion} \
@@ -195,7 +191,6 @@ install -m644 %{db4style_catalog} %{db5style_catalog} %{buildroot}%{etcxmlcatalo
 
 %fdupes -s %{buildroot}
 
-
 %post   -n %{db4package}
 update-xml-catalog