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

[Jan de Groot]

    Date: Saturday, June 30, 2007 @ 08:15:53
  Author: jgc
    Path: /home/cvs-arch/arch/build/office/docbook-xsl

Modified: PKGBUILD (1.16 -> 1.17) docbook-xsl.install (1.3 -> 1.4)

upgpkg: docbook-xsl 1.72.0-3
Move files in the place the install scriptlet expects it to be


---------------------+
 PKGBUILD            |   24 +++++++++++-------------
 docbook-xsl.install |    2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)


Index: arch/build/office/docbook-xsl/PKGBUILD
diff -u arch/build/office/docbook-xsl/PKGBUILD:1.16 arch/build/office/docbook-xsl/PKGBUILD:1.17
--- arch/build/office/docbook-xsl/PKGBUILD:1.16	Sun Jun 10 11:33:50 2007
+++ arch/build/office/docbook-xsl/PKGBUILD	Sat Jun 30 08:15:53 2007
@@ -1,37 +1,35 @@
-# $Id: PKGBUILD,v 1.16 2007/06/10 15:33:50 jgc Exp $
+# $Id: PKGBUILD,v 1.17 2007/06/30 12:15:53 jgc Exp $
 # Contributer: Sean Middleditch <elanthis at awesomeplay.com>
 # Maintainer: dorphell <dorphell at archlinux.org>
 
 pkgname=docbook-xsl
 pkgver=1.72.0
-pkgrel=2
+pkgrel=3
 pkgdesc="XML stylesheets for Docbook-xml transformations."
 arch=(i686 x86_64)
 license=('custom')
 url="http://scrollkeeper.sourceforge.net/docbook.shtml"
 depends=('libxml2' 'libxslt' 'docbook-xml')
-source=(http://kent.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/sourceforge/docbook/docbook-xsl-${pkgver}.tar.bz2)
 install=docbook-xsl.install
 md5sums=('b38b895d47ef7058e4d42b52fdae23f4')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  mkdir -p ${startdir}/pkg/usr/share/xml/docbook/common
-  install -m644 common/*.{xml,xsl,dtd,ent} ${startdir}/pkg/usr/share/xml/docbook/common/
+  mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/common
+  install -m644 common/*.{xml,xsl,dtd,ent} ${startdir}/pkg/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/common/
 
-  mkdir -p ${startdir}/pkg/usr/share/xml/docbook/params
-  install -m644 params/*.xml ${startdir}/pkg/usr/share/xml/docbook/params/
+  mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/params
+  install -m644 params/*.xml ${startdir}/pkg/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/params/
 
   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}/
+    mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}
+    install -m644 ${fn}/*.{xml,xsl} ${startdir}/pkg/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}/
   done
   for fn in eclipse htmlhelp javahelp lib manpages profiling template website xhtml; do
-    mkdir -p ${startdir}/pkg/usr/share/xml/docbook/${fn}
-    install -m644 ${fn}/*.xsl ${startdir}/pkg/usr/share/xml/docbook/${fn}/
+    mkdir -p ${startdir}/pkg/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${fn}
+    install -m644 ${fn}/*.xsl ${startdir}/pkg/usr/share/xml/docbook/xsl-stylesheets-${pkgver}/${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.3 arch/build/office/docbook-xsl/docbook-xsl.install:1.4
--- arch/build/office/docbook-xsl/docbook-xsl.install:1.3	Sat Jun  2 09:27:37 2007
+++ arch/build/office/docbook-xsl/docbook-xsl.install	Sat Jun 30 08:15:53 2007
@@ -34,7 +34,7 @@
   _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
+  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