Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=f30d34ba315f01c124c9acf7e2ddc2e3777b1080

commit f30d34ba315f01c124c9acf7e2ddc2e3777b1080
Author: Baste <[email protected]>
Date:   Mon Oct 7 16:03:34 2013 +0200

docbook-xsl-1.78.1-3-x86_64
*fix .install

diff --git a/source/apps/docbook-xsl/FrugalBuild 
b/source/apps/docbook-xsl/FrugalBuild
index e4c4c9c..30bb7f5 100644
--- a/source/apps/docbook-xsl/FrugalBuild
+++ b/source/apps/docbook-xsl/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=docbook-xsl
pkgver=1.78.1
-pkgrel=2
+pkgrel=3
pkgdesc="XML stylesheets for Docbook-xml transformations."
rodepends=('docbook-xml' 'libxslt' 'sed')
depends=()
diff --git a/source/apps/docbook-xsl/docbook-xsl.install 
b/source/apps/docbook-xsl/docbook-xsl.install
index 8c2aba5..e01e305 100644
--- a/source/apps/docbook-xsl/docbook-xsl.install
+++ b/source/apps/docbook-xsl/docbook-xsl.install
@@ -1,54 +1,46 @@
-
-DOCBOOKDIR=/usr/share/xml/docbook/xsl-stylesheets
-
-post_install()
-{
-       _NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
-
-       xmlcatalog --noout --add "rewriteSystem" \
-               "http://docbook.sourceforge.net/release/xsl/$_NEW"; \
-               "file://${DOCBOOKDIR}" /etc/xml/catalog
-       xmlcatalog --noout --add "rewriteURI" \
-               "http://docbook.sourceforge.net/release/xsl/$_NEW"; \
-               "file://${DOCBOOKDIR}" /etc/xml/catalog
-       xmlcatalog --noout --add "rewriteSystem" \
-               "http://docbook.sourceforge.net/release/xsl/current"; \
-               "file://${DOCBOOKDIR}" /etc/xml/catalog
-       xmlcatalog --noout --add "rewriteURI" \
-               "http://docbook.sourceforge.net/release/xsl/current"; \
-               "file://${DOCBOOKDIR}" /etc/xml/catalog
-       xmlcatalog --noout --add "delegateSystem" \
-               "http://docbook.sourceforge.net/release/xsl/"; \
-               "file:///etc/xml/docbook" /etc/xml/catalog &&
-       xmlcatalog --noout --add "delegateURI" \
-                "http://docbook.sourceforge.net/release/xsl/"; \
-                "file:///etc/xml/docbook" /etc/xml/catalog
+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() {
-# strategy is now to remove all lines added by post_install and add them
-# completely new. This is a bit much, since the only the firts two lines
-# change with new versions, but this way we can do it via the subroutines here
-# Also it is good to remove the lines after deinstallation to get meaningful
-# error messages by apps like conglomerate when docbook-xsl is NOT installed
-       pre_remove $1 $2
-       post_install $1
+  post_remove $2
+  post_install $1
}

-pre_remove() {
-# this is to get rid of the outdated lines
-# line #1: remove all the lines added by a current install scriptlet, 
ATTENTION:
-# if other packages start to add lines to the catalog, this line needs to be 
more adjusted
-# maybe we need the _OLD variable here
-# line #2: kills the delegateURI and delegateSystem
-               xmlcatalog --noout --del "${DOCBOOKDIR}" /etc/xml/catalog &&
-               xmlcatalog --noout --del 
"http://docbook.sourceforge.net/release/xsl/"; /etc/xml/catalog
-
-# save that for later, maybe we need it when other packages add lines to the 
catalog
-# the we can remove stuff more precisely
-# _OLD=`echo $2 | sed 's|\(.*\)\-.*|\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
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to