Date: Saturday, March 9, 2019 @ 12:18:35 Author: heftig Revision: 347557
1.79.2-5: Overhaul; add namespaced stylesheets Modified: docbook-xsl/trunk/PKGBUILD docbook-xsl/trunk/docbook-xsl.install ---------------------+ PKGBUILD | 46 +++++++++++++++++++++++++-------------- docbook-xsl.install | 58 ++++++++++++++++++-------------------------------- 2 files changed, 51 insertions(+), 53 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-09 10:43:49 UTC (rev 347556) +++ PKGBUILD 2019-03-09 12:18:35 UTC (rev 347557) @@ -6,37 +6,49 @@ pkgname=docbook-xsl pkgver=1.79.2 -pkgrel=4 +pkgrel=5 pkgdesc='XML stylesheets for Docbook-xml transformations' +url='https://docbook.org/' arch=(any) license=(custom) -url='https://docbook.org/' -depends=(libxml2 libxslt docbook-xml sed) -install="$pkgname.install" -source=("https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-nons-$pkgver.tar.gz"; +install=$pkgname.install +source=(https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl{,-nons}-$pkgver.tar.gz 765567_non-recursive_string_subst.patch) -sha256sums=('f89425b44e48aad24319a2f0d38e0cb6059fdc7dbaf31787c8346c748175ca8e' +sha256sums=('966188d7c05fc76eaca115a55893e643dd01a3486f6368733c9ad974fcee7a26' + 'f89425b44e48aad24319a2f0d38e0cb6059fdc7dbaf31787c8346c748175ca8e' '193ec26dcb37bdf12037ed4ea98d68bd550500c8e96b719685d76d7096c3f9b3') prepare() { - cd $pkgname-nons-$pkgver + cd $pkgname-$pkgver patch -Np2 -i ../765567_non-recursive_string_subst.patch + + cd ../$pkgname-nons-$pkgver + patch -Np2 -i ../765567_non-recursive_string_subst.patch } package() { - cd $pkgname-nons-$pkgver + depends=(libxml2 libxslt docbook-xml) - _pkgroot="$pkgdir"/usr/share/xml/docbook/xsl-stylesheets-$pkgver + local pkgroot ns dir + for ns in -nons ''; do + pkgroot="$pkgdir/usr/share/xml/docbook/xsl-stylesheets-$pkgver$ns" + dir=$pkgname$ns-$pkgver - install -dm755 ${_pkgroot} - install -m644 VERSION VERSION.xsl ${_pkgroot} + install -Dt "$pkgroot" -m644 $dir/VERSION{,.xsl} - for fn in assembly common eclipse epub epub3 fo highlighting html htmlhelp javahelp lib \ - manpages params profiling roundtrip template website xhtml xhtml-1_1 xhtml5; do - install -dm755 ${_pkgroot}/${fn} - install -m644 ${fn}/*.{xml,xsl,dtd,ent} ${_pkgroot}/${fn} || true # ignore missing files + ( + shopt -s nullglob # ignore missing files + for fn in assembly common eclipse epub epub3 fo highlighting html \ + htmlhelp javahelp lib manpages params profiling roundtrip template \ + website xhtml xhtml-1_1 xhtml5 + do + install -Dt "$pkgroot/$fn" -m644 $dir/$fn/*.{xml,xsl,dtd,ent} + done + ) done - install -dm755 "$pkgdir"/etc/xml - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + install -d "$pkgdir/etc/xml" + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $dir/COPYING } + +# vim:set sw=2 et: Modified: docbook-xsl.install =================================================================== --- docbook-xsl.install 2019-03-09 10:43:49 UTC (rev 347556) +++ docbook-xsl.install 2019-03-09 12:18:35 UTC (rev 347557) @@ -1,38 +1,24 @@ +_xmlcatalog() { + xmlcatalog --noout "$@" etc/xml/catalog +} + post_install() { - if [ ! -f etc/xml/catalog ]; then - xmlcatalog --noout --create etc/xml/catalog - fi - _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'` + [[ -f etc/xml/catalog ]] || _xmlcatalog --create - xmlcatalog --noout --add "rewriteSystem" \ - "http://cdn.docbook.org/release/xsl/${_NEW}"; \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog + local ver x new=${1%-*} - xmlcatalog --noout --add "rewriteURI" \ - "http://cdn.docbook.org/release/xsl/${_NEW}"; \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog + for ver in $new current; do + for x in rewriteSystem rewriteURI; do + _xmlcatalog --add $x http://cdn.docbook.org/release/xsl/$ver \ + /usr/share/xml/docbook/xsl-stylesheets-$new - xmlcatalog --noout --add "rewriteSystem" \ - "http://cdn.docbook.org/release/xsl/current"; \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog + _xmlcatalog --add $x http://docbook.sourceforge.net/release/xsl-ns/$ver \ + /usr/share/xml/docbook/xsl-stylesheets-$new - xmlcatalog --noout --add "rewriteURI" \ - "http://cdn.docbook.org/release/xsl/current"; \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/current"; \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/current"; \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog + _xmlcatalog --add $x http://docbook.sourceforge.net/release/xsl/$ver \ + /usr/share/xml/docbook/xsl-stylesheets-$new-nons + done + done } post_upgrade() { @@ -41,11 +27,11 @@ } post_remove() { - _OLD=`echo $1 | sed 's|\(.*\)\-.*|\1|'` - xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" etc/xml/catalog - - if [ $(vercmp $1 1.72.0-3) -lt 0 ]; then - xmlcatalog --noout --del "/usr/share/xml/docbook" etc/xml/catalog - xmlcatalog --noout --del "file:///etc/xml/docbook" etc/xml/catalog + local old=${1%-*} + _xmlcatalog --del /usr/share/xml/docbook/xsl-stylesheets-$old + if (( $(vercmp $1 1.79.2-5) >= 0 )); then + _xmlcatalog --del /usr/share/xml/docbook/xsl-stylesheets-$old-nons fi } + +# vim:set ft=sh sw=2 et:
