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 @@ + + + +- ++ ientry- ++ + + + +@@ -790,7 +791,10 @@ + + + +- ++ ientry- ++ ++ ++ + + + +@@ -852,7 +856,10 @@ + + + +- ++ ientry- ++ ++ ++ + + + +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 @@ + + + +- ++ ientry- ++ + + + +@@ -729,7 +730,10 @@ + + + +- ++ #ientry- ++ ++ ++ + + + +@@ -788,7 +792,10 @@ + + + +- ++ #ientry- ++ ++ ++ + + + 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 - 1.79.2-13 +- Fix gtk-doc multilib failures + * Mon Jul 27 2020 Fedora Release Engineering - 1.79.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild