From 62b1a3d0ac7584f0b53e0e746d63e02b6aca117c49e163376bcec02c76b005e5 Mon Sep 17 00:00:00 2001
From: Frank Sundermeyer <fs@suse.com>
Date: Tue, 18 Oct 2022 15:09:22 +0000
Subject: [PATCH] Accepting request 1012064 from home:david.anes:daps_test

* Add patch to build against libxslt 1.1.36+:
  - In libxslt >=1.1.35, the XSLT processor changed the resolution
    strategy. It gets two template rules (xi:include/@href and
    xi:include/@*) with the same priority (0.5). That's why we need
    to lower the priority to zero for xi:include/@*
  - Added patch "daps-fix-build-against-libxslt-1.1.36+.patch"

OBS-URL: https://build.opensuse.org/request/show/1012064
OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=230
---
 daps-fix-build-against-libxslt-1.1.36+.patch | 35 ++++++++++++++++++++
 daps.changes                                 | 10 ++++++
 daps.spec                                    |  5 +++
 3 files changed, 50 insertions(+)
 create mode 100644 daps-fix-build-against-libxslt-1.1.36+.patch

diff --git a/daps-fix-build-against-libxslt-1.1.36+.patch b/daps-fix-build-against-libxslt-1.1.36+.patch
new file mode 100644
index 0000000..a3dd05c
--- /dev/null
+++ b/daps-fix-build-against-libxslt-1.1.36+.patch
@@ -0,0 +1,35 @@
+From a58f0f58a318f795bdfe763ea8fc5a5d69ec1cfd Mon Sep 17 00:00:00 2001
+From: Tom Schraitle <toms@suse.de>
+Date: Tue, 11 Oct 2022 08:30:47 +0200
+Subject: [PATCH] Fix #676: Add priority=0 in xi:include/@*
+
+For libxslt >=1.1.35, the default selection strategy has been changed
+(see GNOME/libxslt@b0074ee).
+
+In libxslt >=1.1.35, the XSLT processor changed the resolution strategy.
+It gets two template rules (xi:include/@href and xi:include/@*) with the
+same priority (0.5). That's why we need to lower the priority to zero
+for xi:include/@*
+---
+ daps-xslt/profiling/base-profile.xsl | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/daps-xslt/profiling/base-profile.xsl b/daps-xslt/profiling/base-profile.xsl
+index 819224e5f..474489662 100644
+--- a/daps-xslt/profiling/base-profile.xsl
++++ b/daps-xslt/profiling/base-profile.xsl
+@@ -218,7 +218,12 @@
+    </xsl:attribute>
+ </xsl:template>
+ 
+-<!-- Remove any non-XInclude attributes -->
+-<xsl:template match="xi:include/@*" mode="profile" />
++<!-- Remove any non-XInclude attributes
++
++    Issue #676: add priority="0" to overwrite default priority of 0.5 -> 0
++    The recovery strategy has changed in libxslt >=1.1.35
++    See https://www.w3.org/TR/1999/REC-xslt-19991116#conflict
++-->
++<xsl:template match="xi:include/@*" mode="profile" priority="0" />
+ 
+ </xsl:stylesheet>
diff --git a/daps.changes b/daps.changes
index 6e3c40a..75763f5 100644
--- a/daps.changes
+++ b/daps.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Oct 17 10:57:24 UTC 2022 - David Anes <david.anes@suse.com>
+
+* Add patch to build against libxslt 1.1.36+:
+  - In libxslt >=1.1.35, the XSLT processor changed the resolution 
+    strategy. It gets two template rules (xi:include/@href and 
+    xi:include/@*) with the same priority (0.5). That's why we need 
+    to lower the priority to zero for xi:include/@*
+  - Added patch "daps-fix-build-against-libxslt-1.1.36+.patch"
+
 -------------------------------------------------------------------
 Mon Feb 14 08:00:00 UTC 2022 - Stefan Knorr <sknorr@suse.com>
 
diff --git a/daps.spec b/daps.spec
index 5c6e32e..208933d 100644
--- a/daps.spec
+++ b/daps.spec
@@ -28,6 +28,9 @@ Group:          Productivity/Publishing/XML
 URL:            https://github.com/openSUSE/daps
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        %{name}.rpmlintrc
+
+Patch0:         daps-fix-build-against-libxslt-1.1.36+.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildArch:      noarch
@@ -119,10 +122,12 @@ converting DocBook XML.
 
 
 
+
 #--------------------------------------------------------------------------
 
 %prep
 %setup -q -n %{name}-%{version}
+%autopatch -p1
 
 # Correct shebang line as suggested in
 # https://lists.opensuse.org/opensuse-packaging/2018-03/msg00017.html