From f197b4518c632a87c8e75a65eeae9c11e3fa4062 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 15 Jan 2021 14:30:50 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/docbook-style-xsl.git#1e01e15db14e31ddcd0ebc4a97456a2ed4eac27f
---
 ...tyle-xsl-1.79.2-fix-gtk-doc-multilib.patch | 74 +++++++++++++++++++
 docbook-style-xsl.spec                        |  9 ++-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch

diff --git a/docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch b/docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
new file mode 100644
index 0000000..46d54e2
--- /dev/null
+++ b/docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
@@ -0,0 +1,74 @@
+diff -urN docbook-xsl-nons-1.79.2/fo/autoidx.xsl docbook-xsl-nons-1.79.2.new/fo/autoidx.xsl
+--- docbook-xsl-nons-1.79.2/fo/autoidx.xsl	2016-12-09 22:47:31.000000000 +0000
++++ docbook-xsl-nons-1.79.2.new/fo/autoidx.xsl	2021-01-15 13:20:25.144862117 +0000
+@@ -295,7 +295,8 @@
+   <fo:block>
+     <xsl:if test="$autolink.index.see != 0">
+       <xsl:attribute name="id">
+-        <xsl:value-of select="concat('ientry-', generate-id())"/>
++        <xsl:text>ientry-</xsl:text>
++        <xsl:call-template name="object.id"/>
+       </xsl:attribute>
+     </xsl:if>
+     <xsl:if test="$axf.extensions != 0">
+@@ -790,7 +791,10 @@
+ 
+   <xsl:variable name="linkend">
+     <xsl:if test="$seetarget">
+-      <xsl:value-of select="concat('ientry-', generate-id($seetarget))"/>
++      <xsl:text>ientry-</xsl:text>
++      <xsl:call-template name="object.id">
++        <xsl:with-param name="object" select="$seetarget"/>
++      </xsl:call-template>
+     </xsl:if>
+   </xsl:variable>
+   
+@@ -852,7 +856,10 @@
+ 
+     <xsl:variable name="linkend">
+       <xsl:if test="$seealsotarget">
+-        <xsl:value-of select="concat('ientry-', generate-id($seealsotarget))"/>
++        <xsl:text>ientry-</xsl:text>
++        <xsl:call-template name="object.id">
++          <xsl:with-param name="object" select="$seealsotarget"/>
++        </xsl:call-template>
+       </xsl:if>
+     </xsl:variable>
+ 
+diff -urN docbook-xsl-nons-1.79.2/html/autoidx.xsl docbook-xsl-nons-1.79.2.new/html/autoidx.xsl
+--- docbook-xsl-nons-1.79.2/html/autoidx.xsl	2016-12-09 22:47:30.000000000 +0000
++++ docbook-xsl-nons-1.79.2.new/html/autoidx.xsl	2021-01-15 13:20:25.145862128 +0000
+@@ -306,7 +306,8 @@
+     <xsl:if test="$autolink.index.see != 0">
+       <!-- add internal id attribute to form see and seealso links -->
+       <xsl:attribute name="id">
+-        <xsl:value-of select="concat('ientry-', generate-id())"/>
++        <xsl:text>ientry-</xsl:text>
++        <xsl:call-template name="object.id"/>
+       </xsl:attribute>
+     </xsl:if>
+     <xsl:for-each select="$refs/primary">
+@@ -729,7 +730,10 @@
+ 
+   <xsl:variable name="linkend">
+     <xsl:if test="$seetarget">
+-      <xsl:value-of select="concat('#ientry-', generate-id($seetarget))"/>
++      <xsl:text>#ientry-</xsl:text>
++      <xsl:call-template name="object.id">
++        <xsl:with-param name="object" select="$seetarget"/>
++      </xsl:call-template>
+     </xsl:if>
+   </xsl:variable>
+ 
+@@ -788,7 +792,10 @@
+ 
+     <xsl:variable name="linkend">
+       <xsl:if test="$seealsotarget">
+-        <xsl:value-of select="concat('#ientry-', generate-id($seealsotarget))"/>
++        <xsl:text>#ientry-</xsl:text>
++        <xsl:call-template name="object.id">
++          <xsl:with-param name="object" select="$seealsotarget"/>
++        </xsl:call-template>
+       </xsl:if>
+     </xsl:variable>
+ 
diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index dfb507d..35583cd 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.79.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
 
@@ -39,6 +39,9 @@ Patch5: docbook-xsl-list-item-body.patch
 Patch6: docbook-xsl-mandir.patch
 #Non-recursive string.subst that doesn't kill smb.conf.5 generation
 Patch7: docbook-style-xsl-non-recursive-string-subst.patch
+#Fix multilib problems with gtk-doc documentation
+#https://github.com/docbook/xslt10-stylesheets/issues/54
+Patch8: docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
 
 %description
 These XSL stylesheets allow you to transform any DocBook XML document to
@@ -59,6 +62,7 @@ popd
 %patch5 -p1 -b .listitembody
 %patch6 -p1 -b .mandir
 %patch7 -p2 -b .non-recursive-subst
+%patch8 -p1 -b .gtk-doc-multilib
 
 cp -p %{SOURCE1} Makefile
 
@@ -133,6 +137,9 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Fri Jan 15 2021 David King <amigadave@amigadave.com> - 1.79.2-13
+- Fix gtk-doc multilib failures
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild