Hello community,
here is the log from the commit of package docbook5-xsl-stylesheets for
openSUSE:Factory checked in at 2017-09-04 12:18:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docbook5-xsl-stylesheets (Old)
and /work/SRC/openSUSE:Factory/.docbook5-xsl-stylesheets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook5-xsl-stylesheets"
Mon Sep 4 12:18:50 2017 rev:31 rq:519313 version:1.79.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/docbook5-xsl-stylesheets/docbook5-xsl-stylesheets.changes
2016-07-28 23:44:47.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.docbook5-xsl-stylesheets.new/docbook5-xsl-stylesheets.changes
2017-09-04 12:18:50.958911228 +0200
@@ -1,0 +2,13 @@
+Tue Aug 29 06:45:06 UTC 2017 - [email protected]
+
+- Add docbook5-xsl-stylesheets-non-recursive_string_subst.patch
+ Use str:replace from exslt.org to implement string.subst
+
+ string.subst implementation causes recursion issues when building
+ systemd documentation. This issue has been reported in
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765567 and
+ https://bugs.archlinux.org/task/54694 .
+
+ Taken from
https://github.com/fishilico/xslt10-stylesheets/commit/a7df4fbbef3ab0f97d50aa47f2ccfa0630a2686e
+
+-------------------------------------------------------------------
New:
----
docbook5-xsl-stylesheets-non-recursive_string_subst.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docbook5-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.UgBz96/_old 2017-09-04 12:18:52.258728498 +0200
+++ /var/tmp/diff_new_pack.UgBz96/_new 2017-09-04 12:18:52.258728498 +0200
@@ -1,7 +1,7 @@
#
# spec file for package docbook5-xsl-stylesheets
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -40,6 +40,8 @@
Source0:
http://sourceforge.net/projects/docbook/files/docbook-xsl-ns/%{version}/docbook-xsl-ns-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
# Patch0: %%{name}-dbtoepub.patch
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-non-recursive_string_subst.patch
Use EXSLT replace function to avoid recursive implementation of string.subst
+Patch1: %{name}-non-recursive_string_subst.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://sourceforge.net/projects/docbook/
@@ -56,6 +58,7 @@
%prep
%setup -q -n docbook-xsl-ns-%{version}
# %%patch0 -p1
+%patch1 -p1
# These scripts are available in the docbook-xsl-stylesheet-scripts subpackage
rm fo/pdf2index slides/images/callouts/gen.sh epub/bin/dbtoepub
++++++ docbook5-xsl-stylesheets-non-recursive_string_subst.patch ++++++
Index: docbook-xsl-ns-1.79.0/lib/lib.xsl
===================================================================
--- docbook-xsl-ns-1.79.0.orig/lib/lib.xsl
+++ docbook-xsl-ns-1.79.0/lib/lib.xsl
@@ -10,9 +10,10 @@
This module implements DTD-independent functions
******************************************************************** -->
-<xsl:stylesheet exclude-result-prefixes="d"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:d="http://docbook.org/ns/docbook";
-version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:str="http://exslt.org/strings";
+ exclude-result-prefixes="str"
+ version="1.0">
<xsl:template name="dot.count">
<!-- Returns the number of "." characters in a string -->
@@ -58,6 +59,9 @@ version="1.0">
<xsl:param name="replacement"/>
<xsl:choose>
+ <xsl:when test="function-available('str:replace')">
+ <xsl:value-of select="str:replace($string, string($target),
string($replacement))"/>
+ </xsl:when>
<xsl:when test="contains($string, $target)">
<xsl:variable name="rest">
<xsl:call-template name="string.subst">
