[packages/docbook-style-xsl-nons] - moved: since 1.79.2 base stylesheets are namespaced and non-namespaced have "-nons" suffix
qboosh
qboosh at pld-linux.org
Sun Nov 12 20:39:26 CET 2017
commit be8dde7373f5795ad3f3d1350225133709643667
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Nov 12 20:40:10 2017 +0100
- moved: since 1.79.2 base stylesheets are namespaced and non-namespaced have "-nons" suffix
docbook-style-xsl-non-recursive-string-subst.patch | 30 +++++++++
docbook-style-xsl-nons.spec | 75 ++++++++++++++++++++++
docbook-style-xsl-ns.spec | 69 --------------------
3 files changed, 105 insertions(+), 69 deletions(-)
---
diff --git a/docbook-style-xsl-nons.spec b/docbook-style-xsl-nons.spec
new file mode 100644
index 0000000..e7ac348
--- /dev/null
+++ b/docbook-style-xsl-nons.spec
@@ -0,0 +1,75 @@
+Summary: DocBook XSL NONS (non-namespaced) Stylesheets
+Summary(pl.UTF-8): Arkusze stylów XSL NONS (bez przestrzeni nazw) dla DocBooka
+Name: docbook-style-xsl-nons
+Version: 1.79.2
+Release: 1
+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-nons-%{version}.tar.bz2
+# Source0-md5: 2666d1488d6ced1551d15f31d7ed8c38
+Patch0: docbook-style-xsl-non-recursive-string-subst.patch
+URL: https://github.com/docbook/xslt10-stylesheets
+BuildRequires: libxml2-progs
+BuildRequires: unzip
+AutoReqProv: no
+Requires(post,postun): /etc/xml/catalog
+Requires(post,postun): /usr/bin/xmlcatalog
+# workaround for rpm/poldek
+Requires: /etc/xml/catalog
+Requires: libxml2-progs
+Requires: sgml-common >= 0.5
+Conflicts: docbook-style-xsl < 1.79.2
+BuildArch: noarch
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define xsl_path %{_datadir}/sgml/docbook/xsl-nons-stylesheets
+%define catalog %{xsl_path}/catalog.xml
+
+%description
+This package contains a release of XSL stylesheets for processing
+non-namespaced DocBook documents (DocBook 5 or later). The stylesheets
+are the same as the concurrent stylesheet release except that the
+templates match on elements without the DocBook namespace.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera wydanie arkuszy stylów XSL do przetwarzania
+dokumentów DocBooka bez przestrzeni nazw (DocBook 5 lub późniejszy).
+Arkusze są takie same jak zwykłe wydanie z tą różnicą, że szablony są
+dopasowywane po elementach bez przestrzeni nazw DocBooka.
+
+%prep
+%setup -q -n docbook-xsl-nons-%{version}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{xsl_path}
+
+cp -a $(find . -mindepth 1 -maxdepth 1 -type d -a ! -name extensions) $RPM_BUILD_ROOT%{xsl_path}
+cp -p VERSION.xsl $RPM_BUILD_ROOT%{xsl_path}
+
+%xmlcat_create $RPM_BUILD_ROOT%{catalog}
+
+%xmlcat_add_rewrite http://cdn.docbook.org/release/xsl-nons/%{version} file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
+%xmlcat_add_rewrite http://cdn.docbook.org/release/xsl-nons/current file://%{xsl_path} $RPM_BUILD_ROOT%{catalog}
+# backward compat
+%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}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+if ! grep -q %{catalog} %{_sysconfdir}/xml/catalog ; then
+ %xmlcat_add %{catalog}
+fi
+
+%preun
+if [ "$1" = "0" ] ; then
+ %xmlcat_del %{catalog}
+fi
+
+%files
+%defattr(644,root,root,755)
+%doc AUTHORS BUGS COPYING NEWS README RELEASE-NOTES.{html,txt} TODO
+%{xsl_path}
diff --git a/docbook-style-xsl-ns.spec b/docbook-style-xsl-ns.spec
deleted file mode 100644
index e5bd520..0000000
--- a/docbook-style-xsl-ns.spec
+++ /dev/null
@@ -1,69 +0,0 @@
-Summary: DocBook XSL NS (namespaced) Stylesheets
-Summary(pl.UTF-8): Arkusze stylów XSL NS (z przestrzeniami nazw) dla DocBooka
-Name: docbook-style-xsl-ns
-Version: 1.79.1
-Release: 1
-License: MIT-like
-Group: Applications/Publishing/XML
-Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-ns-%{version}.tar.bz2
-# Source0-md5: b56ca9b2fb3feae34baab5431fd2c867
-URL: http://docbook.sourceforge.net/projects/xsl/index.html
-BuildRequires: libxml2-progs
-BuildRequires: unzip
-AutoReqProv: no
-Requires(post,postun): /etc/xml/catalog
-Requires(post,postun): /usr/bin/xmlcatalog
-# workaround for rpm/poldek
-Requires: /etc/xml/catalog
-Requires: libxml2-progs
-Requires: sgml-common >= 0.5
-BuildArch: noarch
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define xsl_path %{_datadir}/sgml/docbook/xsl-ns-stylesheets
-%define catalog %{xsl_path}/catalog.xml
-
-%description
-This package contains a release of XSL stylesheets for processing
-namespaced DocBook documents (DocBook 5 or later). The stylesheets are
-the same as the concurrent stylesheet release except that the
-templates match on elements in the DocBook namespace.
-
-%description -l pl.UTF-8
-Ten pakiet zawiera wydanie arkuszy stylów XSL do przetwarzania
-dokuemntów DocBooka z przestrzeniami nazw (DocBook 5 lub późniejszy).
-Arkusze są takie same jak zwykłe wydanie z tą różnicą, że szablony są
-dopasowywane po elementach w przestrzeni nazw DocBooka.
-
-%prep
-%setup -q -n docbook-xsl-ns-%{version}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{xsl_path}
-
-cp -a $(find . -mindepth 1 -maxdepth 1 -type d -a ! -name extensions) $RPM_BUILD_ROOT%{xsl_path}
-cp -p VERSION.xsl $RPM_BUILD_ROOT%{xsl_path}
-
-%xmlcat_create $RPM_BUILD_ROOT%{catalog}
-
-%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
-
-%post
-if ! grep -q %{catalog} %{_sysconfdir}/xml/catalog ; then
- %xmlcat_add %{catalog}
-fi
-
-%preun
-if [ "$1" = "0" ] ; then
- %xmlcat_del %{catalog}
-fi
-
-%files
-%defattr(644,root,root,755)
-%doc AUTHORS BUGS COPYING NEWS README RELEASE-NOTES.{html,txt} TODO
-%{xsl_path}
diff --git a/docbook-style-xsl-non-recursive-string-subst.patch b/docbook-style-xsl-non-recursive-string-subst.patch
new file mode 100644
index 0000000..ed302a9
--- /dev/null
+++ b/docbook-style-xsl-non-recursive-string-subst.patch
@@ -0,0 +1,30 @@
+Description: use EXSLT "replace" function when available
+ A recursive implementation of string.subst is problematic,
+ long strings with many matches will cause stack overflows.
+Author: Peter De Wachter <pdewacht at gmail.com>
+Bug-Debian: https://bugs.debian.org/750593
+
+--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl
++++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl
+@@ -10,7 +10,10 @@
+
+ This module implements DTD-independent functions
+
+- ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++ ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++ xmlns:str="http://exslt.org/strings"
++ exclude-result-prefixes="str"
++ version="1.0">
+
+ <xsl:template name="dot.count">
+ <!-- Returns the number of "." characters in a string -->
+@@ -56,6 +59,9 @@
+ <xsl:param name="replacement"/>
+
+ <xsl:choose>
++ <xsl:when test="function-available('str:replace')">
++ <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
++ </xsl:when>
+ <xsl:when test="contains($string, $target)">
+ <xsl:variable name="rest">
+ <xsl:call-template name="string.subst">
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/docbook-style-xsl-nons.git/commitdiff/be8dde7373f5795ad3f3d1350225133709643667
More information about the pld-cvs-commit
mailing list