From f24442ced52c698cbd13713aeb8a05f35ceac68d Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Thu, 4 Jul 2019 23:45:08 +0000 Subject: system/docbook-xsl: overhaul catalog(ue) management --- system/docbook-xsl/APKBUILD | 8 ++-- system/docbook-xsl/docbook-xsl-ns.post-deinstall | 8 ++++ system/docbook-xsl/docbook-xsl-ns.post-install | 29 +++++++++++++++ system/docbook-xsl/docbook-xsl-ns.post-upgrade | 32 ++++++++++++++++ system/docbook-xsl/docbook-xsl.install | 47 ------------------------ system/docbook-xsl/docbook-xsl.post-deinstall | 3 ++ system/docbook-xsl/docbook-xsl.post-install | 8 ++-- system/docbook-xsl/docbook-xsl.post-upgrade | 12 ++++-- 8 files changed, 89 insertions(+), 58 deletions(-) create mode 100644 system/docbook-xsl/docbook-xsl-ns.post-deinstall create mode 100644 system/docbook-xsl/docbook-xsl-ns.post-install create mode 100644 system/docbook-xsl/docbook-xsl-ns.post-upgrade delete mode 100644 system/docbook-xsl/docbook-xsl.install (limited to 'system') diff --git a/system/docbook-xsl/APKBUILD b/system/docbook-xsl/APKBUILD index ebfbf4dee..11a858afa 100644 --- a/system/docbook-xsl/APKBUILD +++ b/system/docbook-xsl/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: A. Wilcox pkgname=docbook-xsl pkgver=1.79.1 -pkgrel=3 -pkgdesc="XML stylesheets for Docbook-xml transformations." +pkgrel=4 +pkgdesc="XML stylesheets for DocBook transformations" url="http://docbook.sourceforge.net/" arch="noarch" options="!check" # Just XML files @@ -11,7 +11,9 @@ license="MIT" depends="libxml2-utils libxslt docbook-xml" subpackages="$pkgname-ns" makedepends="" -install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall" +install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall + $pkgname-ns.post-install $pkgname-ns.post-upgrade + $pkgname-ns.post-deinstall" source="http://downloads.sourceforge.net/sourceforge/docbook/$pkgname-$pkgver.tar.bz2 https://downloads.sourceforge.net/project/docbook/docbook-xsl-ns/$pkgver/$pkgname-ns-$pkgver.tar.bz2 765567_non-recursive_string_subst.patch diff --git a/system/docbook-xsl/docbook-xsl-ns.post-deinstall b/system/docbook-xsl/docbook-xsl-ns.post-deinstall new file mode 100644 index 000000000..fdd4d3652 --- /dev/null +++ b/system/docbook-xsl/docbook-xsl-ns.post-deinstall @@ -0,0 +1,8 @@ +#!/bin/sh + +if command -v xmlcatalog > /dev/null; then + xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog +fi + diff --git a/system/docbook-xsl/docbook-xsl-ns.post-install b/system/docbook-xsl/docbook-xsl-ns.post-install new file mode 100644 index 000000000..33144cc9e --- /dev/null +++ b/system/docbook-xsl/docbook-xsl-ns.post-install @@ -0,0 +1,29 @@ +#!/bin/sh + +if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog +fi + + +_NEW=${1%-r[0-9]*} + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog && + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog && + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + diff --git a/system/docbook-xsl/docbook-xsl-ns.post-upgrade b/system/docbook-xsl/docbook-xsl-ns.post-upgrade new file mode 100644 index 000000000..95d045de0 --- /dev/null +++ b/system/docbook-xsl/docbook-xsl-ns.post-upgrade @@ -0,0 +1,32 @@ +#!/bin/sh + +if [ ! -f /etc/xml/catalog ]; then + xmlcatalog --noout --create /etc/xml/catalog +fi + +_NEW=${1%-r[0-9]*} + +xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + +xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "/usr/share/xml/docbook/xsl-stylesheets-ns" \ + etc/xml/catalog + diff --git a/system/docbook-xsl/docbook-xsl.install b/system/docbook-xsl/docbook-xsl.install deleted file mode 100644 index a8ea3e72b..000000000 --- a/system/docbook-xsl/docbook-xsl.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - if [ ! -f /etc/xml/catalog ]; then - xmlcatalog --noout --create /etc/xml/catalog - fi - _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'` - - xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ - etc/xml/catalog - - xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/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 -} - -post_upgrade() { - post_remove $2 - post_install $1 -} - -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 - fi -} - -op=$1 -shift - -$op $* - diff --git a/system/docbook-xsl/docbook-xsl.post-deinstall b/system/docbook-xsl/docbook-xsl.post-deinstall index 3faecd5a3..ffe2a0f23 100644 --- a/system/docbook-xsl/docbook-xsl.post-deinstall +++ b/system/docbook-xsl/docbook-xsl.post-deinstall @@ -6,5 +6,8 @@ if command -v xmlcatalog > /dev/null; then xmlcatalog --noout --del \ "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \ etc/xml/catalog + xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets" \ + etc/xml/catalog fi diff --git a/system/docbook-xsl/docbook-xsl.post-install b/system/docbook-xsl/docbook-xsl.post-install index 6afae6abe..250f7b986 100644 --- a/system/docbook-xsl/docbook-xsl.post-install +++ b/system/docbook-xsl/docbook-xsl.post-install @@ -9,21 +9,21 @@ _NEW=${1%-r[0-9]*} xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog && xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog && xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog diff --git a/system/docbook-xsl/docbook-xsl.post-upgrade b/system/docbook-xsl/docbook-xsl.post-upgrade index d481480fc..5c82ae7d9 100644 --- a/system/docbook-xsl/docbook-xsl.post-upgrade +++ b/system/docbook-xsl/docbook-xsl.post-upgrade @@ -11,23 +11,27 @@ xmlcatalog --noout --del \ "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \ etc/xml/catalog +xmlcatalog --noout --del \ + "/usr/share/xml/docbook/xsl-stylesheets" \ + etc/xml/catalog + xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/${_NEW}" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "/usr/share/xml/docbook/xsl-stylesheets-${_NEW}" \ + "/usr/share/xml/docbook/xsl-stylesheets" \ etc/xml/catalog -- cgit v1.2.3-60-g2f50