aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSertonix <sertonix@posteo.net>2024-04-09 17:01:08 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2024-04-10 18:36:20 +0000
commit14ada951266affa3b2050052b3e9743764f9e622 (patch)
treeaeb2272f23876b362c7ca9febda1ce5e30e41e18
parent328f50dbdd2c461eaf2de5760a6481f9e6e80144 (diff)
main/docbook-x*: fix deinstall scripts
-rw-r--r--main/docbook-xml/APKBUILD4
-rw-r--r--main/docbook-xml/docbook-xml.pre-deinstall (renamed from main/docbook-xml/docbook-xml.post-deinstall)0
-rw-r--r--main/docbook-xsl/APKBUILD4
-rw-r--r--main/docbook-xsl/docbook-xsl.post-upgrade3
-rw-r--r--main/docbook-xsl/docbook-xsl.pre-deinstall (renamed from main/docbook-xsl/docbook-xsl.post-deinstall)3
5 files changed, 7 insertions, 7 deletions
diff --git a/main/docbook-xml/APKBUILD b/main/docbook-xml/APKBUILD
index 8a044ddb584..9b95fda9c55 100644
--- a/main/docbook-xml/APKBUILD
+++ b/main/docbook-xml/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=docbook-xml
pkgver=4.5
-pkgrel=8
+pkgrel=9
pkgdesc="A widely used XML scheme for writing documentation and help"
url="https://scrollkeeper.sourceforge.net/docbook.shtml"
arch="noarch"
license="MIT"
depends="libxml2-utils"
options="!check"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
source="https://www.docbook.org/xml/$pkgver/docbook-xml-$pkgver.zip
https://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
https://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
diff --git a/main/docbook-xml/docbook-xml.post-deinstall b/main/docbook-xml/docbook-xml.pre-deinstall
index ed0157da7a6..ed0157da7a6 100644
--- a/main/docbook-xml/docbook-xml.post-deinstall
+++ b/main/docbook-xml/docbook-xml.pre-deinstall
diff --git a/main/docbook-xsl/APKBUILD b/main/docbook-xsl/APKBUILD
index 37aa9e09d67..d1046cb399a 100644
--- a/main/docbook-xsl/APKBUILD
+++ b/main/docbook-xsl/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=docbook-xsl
pkgver=1.79.2
-pkgrel=8
+pkgrel=9
pkgdesc="XML stylesheets for Docbook-xml transformations."
url="https://docbook.org/"
arch="noarch"
license="custom"
depends="libxml2-utils libxslt docbook-xml"
options="!check"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
source="https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F$pkgver/docbook-xsl-$pkgver.tar.gz
765567_non-recursive_string_subst.patch
f6c5eefbca775e312afebf576a6990344a0b1b69.patch
diff --git a/main/docbook-xsl/docbook-xsl.post-upgrade b/main/docbook-xsl/docbook-xsl.post-upgrade
index a0dc75de3cc..fbac4a49f40 100644
--- a/main/docbook-xsl/docbook-xsl.post-upgrade
+++ b/main/docbook-xsl/docbook-xsl.post-upgrade
@@ -7,13 +7,14 @@ fi
newver=${1%-r[0-9]*}
oldver=${2%-r[0-9]*}
+docbookdir=/usr/share/xml/docbook
+
if [ -n "$oldver" ]; then # upgrade
xmlcatalog --noout --del \
"file://$docbookdir/xsl-stylesheets-$oldver" \
etc/xml/catalog
fi
-docbookdir=/usr/share/xml/docbook
urls="
http://cdn.docbook.org/release/xsl-nons
http://docbook.sourceforge.net/release/xsl
diff --git a/main/docbook-xsl/docbook-xsl.post-deinstall b/main/docbook-xsl/docbook-xsl.pre-deinstall
index 2b9f0d4a15e..ccfc304fd75 100644
--- a/main/docbook-xsl/docbook-xsl.post-deinstall
+++ b/main/docbook-xsl/docbook-xsl.pre-deinstall
@@ -4,7 +4,6 @@ _OLD=${1%-r[0-9]*}
if which xmlcatalog > /dev/null; then
xmlcatalog --noout --del \
- "/usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
+ "file:///usr/share/xml/docbook/xsl-stylesheets-${_OLD}" \
etc/xml/catalog
fi
-