From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 12 Nov 2017 19:48:16 +0000 (+0100)
Subject: - updated XML catalog URLs
X-Git-Tag: auto/th/docbook-style-xsl-1.79.2-3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=c61a4ba65d7911a7043dad57d2cbea78dfcab765;p=packages%2Fdocbook-style-xsl.git

- updated XML catalog URLs
- since 1.79.2 base stylesheets are namespaced, so obsolete docbook-style-xsl-ns package
  (non-namespaced stylesheets can be found in docbook-style-xsl-nons package now)
- release 3
---

diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index 858c2f4..71408e5 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -3,17 +3,19 @@
 #    /usr/share/java/lucene-core-3.0.0.jar
 #    /usr/share/java/tagsoup-1.2.1.jar
 #    /usr/share/java/webhelpindexer.jar
-# (all as webhelpidexer-externsions? -n java-webhelpindexer? use java-lucene.spec after upgrade?)
+# (all as webhelpindexer-extensions? -n java-webhelpindexer? use java-lucene.spec after upgrade?)
 Summary:	Norman Walsh's modular stylesheets for DocBook
 Summary(pl.UTF-8):	Arkusze stylów XSL dla DocBooka
 Summary(pt_BR.UTF-8):	Stylesheets modulares do Norman Walsh para DocBook
 Name:		docbook-style-xsl
 Version:	1.79.2
-Release:	2
+Release:	3
 License:	MIT-like
 Group:		Applications/Publishing/XML
+#Source0Download: https://github.com/docbook/xslt10-stylesheets/releases
 Source0:	https://github.com/docbook/xslt10-stylesheets/releases/download/release/%{version}/docbook-xsl-%{version}.tar.bz2
 # Source0-md5:	4a400f0264a19329c7f95f69e098744a
+#Source1Download: https://github.com/docbook/xslt10-stylesheets/releases
 Source1:	https://github.com/docbook/xslt10-stylesheets/releases/download/release/%{version}/docbook-xsl-doc-%{version}.tar.bz2
 # Source1-md5:	62375ca864fc198cb2b17d98209d0b8c
 Patch0:		docbook-style-xsl-non-recursive-string-subst.patch
@@ -27,6 +29,9 @@ Requires(post,postun):	/usr/bin/xmlcatalog
 Requires:	/etc/xml/catalog
 Requires:	libxml2-progs
 Requires:	sgml-common >= 0.5
+# since 1.79.2 "base" stylesheets are namespaced, non-namespaced have "-nons" suffix
+Provides:	docbook-style-xsl-ns = %{version}
+Obsoletes:	docbook-style-xsl-ns < 1.79.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -98,8 +103,11 @@ cp -p extensions/*.jar $RPM_BUILD_ROOT%{_javalibdir}
 
 %xmlcat_create $RPM_BUILD_ROOT%{catalog}
 
-%xmlcat_add_rewrite http://docbook.sourceforge.net/release/xsl/%{version} file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
-%xmlcat_add_rewrite http://docbook.sourceforge.net/release/xsl/current file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
+%xmlcat_add_rewrite http://cdn.docbook.org/release/xsl/%{version} file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
+%xmlcat_add_rewrite http://cdn.docbook.org/release/xsl/current file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
+# backward compat
+%xmlcat_add_rewrite http://docbook.sourceforge.net/release/xsl-ns/%{version} file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
+%xmlcat_add_rewrite http://docbook.sourceforge.net/release/xsl-ns/current file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
 
 %clean
 rm -rf $RPM_BUILD_ROOT