From 46e4f6043f3e06bf7586232e73f1c36694a8d478 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 18 2021 06:58:34 +0000
Subject: import docbook-style-xsl-1.79.2-9.el8


---

diff --git a/SOURCES/docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch b/SOURCES/docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
new file mode 100644
index 0000000..46d54e2
--- /dev/null
+++ b/SOURCES/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/SPECS/docbook-style-xsl.spec b/SPECS/docbook-style-xsl.spec
index 9f2797e..dc14e51 100644
--- a/SPECS/docbook-style-xsl.spec
+++ b/SPECS/docbook-style-xsl.spec
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.79.2
-Release: 7%{?dist}
+Release: 9%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -40,6 +40,8 @@ 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 generate consistent IDs so it doesn't cause multilib conflicts (#1761964)
+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
@@ -60,6 +62,7 @@ popd
 %patch5 -p1 -b .listitembody
 %patch6 -p1 -b .mandir
 %patch7 -p2 -b .non-recursive-subst
+%patch8 -p1 -b .genconstids
 
 cp -p %{SOURCE1} Makefile
 
@@ -139,6 +142,9 @@ if [ "$1" = 0 ]; then
 fi
 
 %changelog
+* Wed Jan 20 2021 Ondrej Vasik <ovasik@redhat.com> - 1.79.2-9
+- fix generate consistent IDs issue (#1761964)
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild