[arch-commits] CVS update of arch/build/office/docbook-xsl (2 files)

Jan de Groot jgc at archlinux.org
Sat Jun 2 09:27:37 EDT 2007


    Date: Saturday, June 2, 2007 @ 09:27:37
  Author: jgc
    Path: /home/cvs-arch/arch/build/office/docbook-xsl

Modified: PKGBUILD (1.14 -> 1.15) docbook-xsl.install (1.2 -> 1.3)

upgpkg: docbook-xsl 1.72.0-1
Fix install scriptlet, add license, update to latest version


---------------------+
 PKGBUILD            |   18 ++++++------
 docbook-xsl.install |   72 +++++++++++++++++++++++---------------------------
 2 files changed, 44 insertions(+), 46 deletions(-)


Index: arch/build/office/docbook-xsl/PKGBUILD
diff -u arch/build/office/docbook-xsl/PKGBUILD:1.14 arch/build/office/docbook-xsl/PKGBUILD:1.15
--- arch/build/office/docbook-xsl/PKGBUILD:1.14	Tue Dec 26 09:15:59 2006
+++ arch/build/office/docbook-xsl/PKGBUILD	Sat Jun  2 09:27:37 2007
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD,v 1.14 2006/12/26 14:15:59 jgc Exp $
+# $Id: PKGBUILD,v 1.15 2007/06/02 13:27:37 jgc Exp $
 # Contributer: Sean Middleditch <elanthis at awesomeplay.com>
 # Maintainer: dorphell <dorphell at archlinux.org>
 
 pkgname=docbook-xsl
-pkgver=1.71.1
-pkgrel=2
+pkgver=1.72.0
+pkgrel=1
 pkgdesc="XML stylesheets for Docbook-xml transformations."
 arch=(i686 x86_64)
+license=('custom')
 url="http://scrollkeeper.sourceforge.net/docbook.shtml"
-depends=('libxml2' 'libxslt')
-source=(http://heanet.dl.sourceforge.net/sourceforge/docbook/${pkgname}-${pkgver}.tar.gz)
+depends=('libxml2' 'libxslt' 'docbook-xml')
+source=(http://kent.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-${pkgver}.tar.bz2)
 install=docbook-xsl.install
-md5sums=('4c89105067c733d646f4629bf2ec1b8b')
+md5sums=('b38b895d47ef7058e4d42b52fdae23f4')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -21,7 +22,7 @@
   mkdir -p ${startdir}/pkg/usr/share/xml/docbook/params
   install -m644 params/*.xml ${startdir}/pkg/usr/share/xml/docbook/params/
 
-  for fn in fo highlighting html wordml; do
+  for fn in fo highlighting html roundtrip; do
     mkdir -p ${startdir}/pkg/usr/share/xml/docbook/${fn}
     install -m644 ${fn}/*.{xml,xsl} ${startdir}/pkg/usr/share/xml/docbook/${fn}/
   done
@@ -30,6 +31,7 @@
     install -m644 ${fn}/*.xsl ${startdir}/pkg/usr/share/xml/docbook/${fn}/
   done
   mkdir -p ${startdir}/pkg/etc/xml
-
   install -m644 VERSION ${startdir}/pkg/usr/share/xml/docbook/
+
+  install -m644 -D COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
 }
Index: arch/build/office/docbook-xsl/docbook-xsl.install
diff -u arch/build/office/docbook-xsl/docbook-xsl.install:1.2 arch/build/office/docbook-xsl/docbook-xsl.install:1.3
--- arch/build/office/docbook-xsl/docbook-xsl.install:1.2	Fri Oct 29 02:52:01 2004
+++ arch/build/office/docbook-xsl/docbook-xsl.install	Sat Jun  2 09:27:37 2007
@@ -1,47 +1,43 @@
 post_install() {
-
-	if [ ! -f /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog --noout --create /etc/xml/catalog; fi &&
-		if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create /etc/xml/docbook; fi &&
-
-			_NEW=`echo $1 | sed 's|\(.*\)\-.*|\1|'`
-				xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/$_NEW" \
-				"/usr/share/xml/docbook" /etc/xml/catalog &&
-				xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/xsl/$_NEW" \
-				"/usr/share/xml/docbook" /etc/xml/catalog &&
-				xmlcatalog --noout --add "rewriteSystem" "http://docbook.sourceforge.net/release/xsl/current" \
-				"/usr/share/xml/docbook" /etc/xml/catalog &&
-				xmlcatalog --noout --add "rewriteURI" "http://docbook.sourceforge.net/release/xsl/current" \
-				"/usr/share/xml/docbook" /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
+  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: to fix the old stuff from bug #1691, can be removed after two or three upgpkg, I think
-# line #2: 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 #3: kills the delegateURI and delegateSystem
-	xmlcatalog --noout --del "/usr/share/xml/docbook/xsl-stylesheets-1.60.1" /etc/xml/catalog &&
-		xmlcatalog --noout --del "/usr/share/xml/docbook" /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) -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




More information about the arch-commits mailing list