Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=78774ab576ba4c82d43fe48b61d9bd33690b27c4

commit 78774ab576ba4c82d43fe48b61d9bd33690b27c4
Author: Michel Hermier <herm...@frugalware.org>
Date:   Thu Jan 14 13:21:34 2010 +0100

docbook-xml-4.5-5-i686

* pkgrel++
* Fix some path issues, and remove numbered path versions.

diff --git a/source/apps/docbook-xml/FrugalBuild 
b/source/apps/docbook-xml/FrugalBuild
index 80cadbe..bef04fe 100644
--- a/source/apps/docbook-xml/FrugalBuild
+++ b/source/apps/docbook-xml/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=docbook-xml
pkgver=4.5
-pkgrel=4
+pkgrel=5
pkgdesc="A widely used XML scheme for writing documentation and help"
url="http://www.oasis-open.org/docbook/xml/";
depends=('libxml2')
@@ -18,11 +18,12 @@ install="$pkgname.install"
options=('scriptlet')

build() {
-       Fmkdir /usr/share/sgml/docbook/dtd/xml-dtd-$pkgver
-       Ffilerel *.cat /usr/share/sgml/docbook/dtd/xml-dtd-$pkgver/
-       Ffilerel *.dtd /usr/share/sgml/docbook/dtd/xml-dtd-$pkgver/
-       Ffilerel *.xml /usr/share/sgml/docbook/dtd/xml-dtd-$pkgver/
-       Ffilerel *.mod /usr/share/sgml/docbook/dtd/xml-dtd-$pkgver/
-       Fcprel ent /usr/share/sgml/docbook/dtd/xml-dtd-$pkgver/
+       local installdir="/usr/share/xml/docbook/xml-dtd"
+       Fmkdir "$installdir"
+       Ffilerel *.cat "$installdir"
+       Ffilerel *.dtd "$installdir"
+       Ffilerel *.xml "$installdir"
+       Ffilerel *.mod "$installdir"
+       Fcprel ent "$installdir"
}

diff --git a/source/apps/docbook-xml/docbook-xml.install 
b/source/apps/docbook-xml/docbook-xml.install
index 29a761f..1782663 100644
--- a/source/apps/docbook-xml/docbook-xml.install
+++ b/source/apps/docbook-xml/docbook-xml.install
@@ -1,7 +1,7 @@
subver=('4.1.2' '4.2' '4.3' '4.4') # '4.5'
ROOTCATALOG=/etc/xml/catalog
CATALOG=/etc/xml/docbook
-DOCBOOKDIR=/usr/share/xml/docbook
+DOCBOOKDIR=/usr/share/xml/docbook/xml-dtd

catalog_create_empty() {
local catalog="$1"
@@ -44,43 +44,43 @@ catalog_add() {
"$CATALOG"
xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML CALS Table Model V$_NEW//EN" \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW/calstblx.dtd" \
+               "file://${DOCBOOKDIR}/calstblx.dtd" \
"$CATALOG"
xmlcatalog --noout --add "public" \
"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW/soextblx.dtd" \
+               "file://${DOCBOOKDIR}/soextblx.dtd" \
"$CATALOG"
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Information Pool V$_NEW//EN" \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW/dbpoolx.mod" \
+               "file://${DOCBOOKDIR}/dbpoolx.mod" \
"$CATALOG"
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$_NEW//EN" \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW/dbhierx.mod" \
+               "file://${DOCBOOKDIR}/dbhierx.mod" \
"$CATALOG"
xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML HTML Tables V$_NEW//EN" \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW/htmltblx.mod" \
+               "file://${DOCBOOKDIR}/htmltblx.mod" \
"$CATALOG"
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Notations V$_NEW//EN" \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW/dbnotnx.mod" \
+               "file://${DOCBOOKDIR}/dbnotnx.mod" \
"$CATALOG"
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Character Entities V$_NEW//EN" \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW/dbcentx.mod" \
+               "file://${DOCBOOKDIR}/dbcentx.mod" \
"$CATALOG"
xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Additional General Entities V$_NEW//EN" \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW/dbgenent.mod" \
+               "file://${DOCBOOKDIR}/dbgenent.mod" \
"$CATALOG"
xmlcatalog --noout --add "rewriteSystem" \
"http://www.oasis-open.org/docbook/xml/$_NEW"; \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW" \
+               "file://${DOCBOOKDIR}/" \
"$CATALOG"
xmlcatalog --noout --add "rewriteURI" \
"http://www.oasis-open.org/docbook/xml/$_NEW"; \
-               "file://${DOCBOOKDIR}/xml-dtd-$_NEW" \
+               "file://${DOCBOOKDIR}/" \
"$CATALOG"

xmlcatalog --noout --add "delegatePublic" \
@@ -109,11 +109,11 @@ catalog_add() {
"$CATALOG"
xmlcatalog --noout --add "rewriteSystem" \
"http://www.oasis-open.org/docbook/xml/$DTDVERSION"; \
-                       "file://${DOCBOOKDIR}/xml-dtd-$_NEW" \
+                       "file://${DOCBOOKDIR}" \
"$CATALOG"
xmlcatalog --noout --add "rewriteURI" \
"http://www.oasis-open.org/docbook/xml/$DTDVERSION"; \
-                       "file://${DOCBOOKDIR}/xml-dtd-$_NEW" \
+                       "file://${DOCBOOKDIR}" \
"$CATALOG"
xmlcatalog --noout --add "delegateSystem" \
"http://www.oasis-open.org/docbook/xml/$DTDVERSION/"; \
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to