From eab8d56e10081c94933b94602e2292fe27adabe8 Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Fri, 28 Jan 2022 09:47:17 +0000
Subject: [PATCH] Fix validity of tutorial XML (#2047326)

Resolves: #2047326
---
 libxslt-1.1.34-tutorial2-dtd.patch | 42 ++++++++++++++++++++++++++++--
 libxslt.spec                       |  5 +++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/libxslt-1.1.34-tutorial2-dtd.patch b/libxslt-1.1.34-tutorial2-dtd.patch
index 9833b65..4a12a17 100644
--- a/libxslt-1.1.34-tutorial2-dtd.patch
+++ b/libxslt-1.1.34-tutorial2-dtd.patch
@@ -1,7 +1,7 @@
-From 5add07e76bbb514fee7c80217ed0f58b72bdedd6 Mon Sep 17 00:00:00 2001
+From 461af8b9ed05cae188b24db71949a9e7758693e7 Mon Sep 17 00:00:00 2001
 From: David King <amigadave@amigadave.com>
 Date: Thu, 27 Jan 2022 15:33:17 +0000
-Subject: [PATCH] Use DocBook URL for tutorial DTD
+Subject: [PATCH 1/2] Use DocBook URL for tutorial DTD
 
 ---
  doc/tutorial2/libxslt_pipes.xml | 4 ++--
@@ -23,3 +23,41 @@ index 9a672a9b..2aaac95f 100644
 -- 
 2.34.1
 
+
+From 634065b39285841eef7dab5bfb2a8ac71b0a5d05 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Fri, 28 Jan 2022 09:35:03 +0000
+Subject: [PATCH 2/2] Fix validity of tutorial XML
+
+Move the title element before articleinfo.
+
+https://tdg.docbook.org/tdg/4.5/article.html
+---
+ doc/tutorial2/libxslt_pipes.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/tutorial2/libxslt_pipes.xml b/doc/tutorial2/libxslt_pipes.xml
+index 2aaac95f..f6fa0d64 100644
+--- a/doc/tutorial2/libxslt_pipes.xml
++++ b/doc/tutorial2/libxslt_pipes.xml
+@@ -3,6 +3,8 @@
+                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+ 
+ <article id="libxslt">
++<title>libxslt: An Extended Tutorial</title>
++
+ <articleinfo>
+   <author><firstname>Panos</firstname><surname>Louridas</surname></author>
+   <copyright>
+@@ -34,8 +36,6 @@
+   </legalnotice>
+ </articleinfo>
+ 
+-<title>libxslt: An Extended Tutorial</title>
+-
+ <sect1><title>Introduction</title>
+ 
+ <para>The Extensible Stylesheet Language Transformations (XSLT)
+-- 
+2.34.1
+
diff --git a/libxslt.spec b/libxslt.spec
index 924623a..05b9838 100644
--- a/libxslt.spec
+++ b/libxslt.spec
@@ -1,7 +1,7 @@
 Name:           libxslt
 Summary:        Library providing the Gnome XSLT engine
 Version:        1.1.34
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 License:        MIT
 URL:            http://xmlsoft.org/XSLT
@@ -128,6 +128,9 @@ rm -vrf %{buildroot}%{_docdir}
 %endif
 
 %changelog
+* Fri Jan 28 2022 David King <amigadave@amigadave.com> - 1.1.34-9
+- Fix validity of tutorial XML (#2047326)
+
 * Thu Jan 27 2022 David King <amigadave@amigadave.com> - 1.1.34-8
 - Fix DTD in tutorial XML (#2047326)