From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 26 Nov 2017 10:59:08 +0000 (+0100)
Subject: - xsl styles are namespaced now
X-Git-Tag: auto/th/gtk-doc-1.26-3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=d6bb8bc1cfd57cdf8a4902e11fed341ce2b3fe14;p=packages%2Fgtk-doc.git

- xsl styles are namespaced now
- rel 3
---

diff --git a/gtk-doc.spec b/gtk-doc.spec
index 7e7a403..5d5ca7e 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -9,13 +9,13 @@ Summary(pl.UTF-8):	Narzędzie do generowania dokumentacji API do GTK+ i GNOME
 Summary(pt_BR.UTF-8):	O gerador de documentação do GTK
 Name:		gtk-doc
 Version:	1.26
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		Development/Tools
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	1ad4a1dbf804889fdc85f8eec45e8696
 Patch0:		%{name}-noarch.patch
-Patch1:		use-local-xsl.patch
+Patch1:		xsl-ns.patch
 URL:		http://www.gtk.org/gtk-doc/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
diff --git a/use-local-xsl.patch b/use-local-xsl.patch
deleted file mode 100644
index 88a9a98..0000000
--- a/use-local-xsl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk-doc-1.26/gtk-doc.xsl~	2015-06-26 08:05:50.000000000 +0200
-+++ gtk-doc-1.26/gtk-doc.xsl	2017-11-26 11:32:55.545442969 +0100
-@@ -7,7 +7,7 @@
-   <!-- import the chunked XSL stylesheet -->
-   <!-- http://www.sagehill.net/docbookxsl/Chunking.html says we should use
-        "chunkfast.xsl", but I can see a difference -->
--  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
-+  <xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
-   <xsl:include href="devhelp2.xsl"/>
-   <xsl:include href="version-greater-or-equal.xsl"/>
- 
diff --git a/xsl-ns.patch b/xsl-ns.patch
new file mode 100644
index 0000000..5b9d6ef
--- /dev/null
+++ b/xsl-ns.patch
@@ -0,0 +1,22 @@
+--- gtk-doc-1.26/gtk-doc.xsl~	2015-06-26 08:05:50.000000000 +0200
++++ gtk-doc-1.26/gtk-doc.xsl	2017-11-26 11:32:55.545442969 +0100
+@@ -7,7 +7,7 @@
+   <!-- import the chunked XSL stylesheet -->
+   <!-- http://www.sagehill.net/docbookxsl/Chunking.html says we should use
+        "chunkfast.xsl", but I can see a difference -->
+-  <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
++  <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/chunk.xsl"/>
+   <xsl:include href="devhelp2.xsl"/>
+   <xsl:include href="version-greater-or-equal.xsl"/>
+ 
+--- gtk-doc-1.26/configure.ac~	2017-11-26 11:56:42.000000000 +0100
++++ gtk-doc-1.26/configure.ac	2017-11-26 11:57:11.985289031 +0100
+@@ -53,7 +53,7 @@
+ 
+ dnl check for DocBook DTD and stylesheets in the local catalog.
+ JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.3//EN], [DocBook XML DTD V4.3])
+-JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl], [DocBook XSL Stylesheets])
++JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl-ns/current/html/chunk.xsl], [DocBook XSL Stylesheets])
+ 
+ dnl
+ dnl Check for syntax highlighters