[Lunar-commits] <moonbase> docbook: fixed remaining issues

[Zbigniew Luszpinski]

commit 03225f5221afbec72dbd0cb9db68e87722707e32
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Sep 12 16:54:32 2010 +0200

    docbook: fixed remaining issues
---
 doc-tools/docbook-sgml/DETAILS      |    1 -
 doc-tools/docbook-sgml/POST_INSTALL |    7 ++-----
 doc-tools/docbook-sgml/PRE_BUILD    |    2 --
 doc-tools/docbook-xml/POST_INSTALL  |   32 +++++++-------------------------
 doc-tools/docbook-xml/PRE_BUILD     |    3 +--
 5 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/doc-tools/docbook-sgml/DETAILS b/doc-tools/docbook-sgml/DETAILS
index 397dbd5..8231897 100644
--- a/doc-tools/docbook-sgml/DETAILS
+++ b/doc-tools/docbook-sgml/DETAILS
@@ -39,5 +39,4 @@ The DocBook Technical Committee maintains the DocBook schema.
 DocBook is officially available as a Document Type Definition (DTD) 
 for both XML and SGML. It is unofficially available in other forms 
 as well.
-
 EOF
diff --git a/doc-tools/docbook-sgml/POST_INSTALL b/doc-tools/docbook-sgml/POST_INSTALL
index 76eae0d..a878918 100644
--- a/doc-tools/docbook-sgml/POST_INSTALL
+++ b/doc-tools/docbook-sgml/POST_INSTALL
@@ -1,4 +1,4 @@
-CENTRALIZED=/etc/sgml/catalog 
+CENTRALIZED=/etc/sgml/catalog
 if ! [ -e "$CENTRALIZED" ]; then
      echo "Creating $CENTRALIZED"
      mkdir -p /etc/sgml
@@ -10,13 +10,10 @@ for DOCBOOK in `ls -d $DOCBOOK_INSTALL_DIR/*`
 do
 install-catalog --add $CENTRALIZED $DOCBOOK/catalog
 done
+
 # Do not loopback (breaks docbook-utils build)
 install-catalog -r $CENTRALIZED /etc/sgml/catalog
 
-find $DOCBOOK_INSTALL_DIR -type d -exec chmod 755 {} \;
-find $DOCBOOK_INSTALL_DIR -type f -exec chmod 644 {} \;
-chown -R root:root $DOCBOOK_INSTALL_DIR
-
 if module_installed docbook-utils; then
   lin -rc docbook-utils
 fi
diff --git a/doc-tools/docbook-sgml/PRE_BUILD b/doc-tools/docbook-sgml/PRE_BUILD
index 1a50e4f..c34bb84 100644
--- a/doc-tools/docbook-sgml/PRE_BUILD
+++ b/doc-tools/docbook-sgml/PRE_BUILD
@@ -7,8 +7,6 @@ unzip $SOURCE_CACHE/$SOURCE2 -d $SOURCE_DIRECTORY/4.1 &&
 unzip $SOURCE_CACHE/$SOURCE3 -d $SOURCE_DIRECTORY/4.2 &&
 unzip $SOURCE_CACHE/$SOURCE4 -d $SOURCE_DIRECTORY/4.3 &&
 unzip $SOURCE_CACHE/$SOURCE5 -d $SOURCE_DIRECTORY/4.5 &&
-mkdir old.libraries &&
-touch old.libraries/dontbreak &&
 CENTRALIZED=/etc/sgml/catalog
 for DOCBOOK_INSTALL_DIR in `ls -d /usr/share/sgml/docbook/{3*,4*,docbook-sgml*,sgml} 2>/dev/null`
 do install-catalog -r $CENTRALIZED $DOCBOOK_INSTALL_DIR/catalog; done
diff --git a/doc-tools/docbook-xml/POST_INSTALL b/doc-tools/docbook-xml/POST_INSTALL
index 0d4e285..81a7dfd 100644
--- a/doc-tools/docbook-xml/POST_INSTALL
+++ b/doc-tools/docbook-xml/POST_INSTALL
@@ -1,20 +1,4 @@
-CENTRALIZED=/etc/sgml/catalog
-if ! [ -e "$CENTRALIZED" ]; then
-     echo "Creating $CENTRALIZED"
-     mkdir -p /etc/sgml
-     touch $CENTRALIZED
-fi
-
-DOCBOOK_INSTALL_DIR=/usr/share/sgml/docbook/xml
-for DOCBOOK in `ls -d $DOCBOOK_INSTALL_DIR/*`
-do
-install-catalog --add $CENTRALIZED $DOCBOOK/catalog
-done
-rm -rf /usr/share/sgml/docbook/old.libraries
-
-find $DOCBOOK_INSTALL_DIR -type d -exec chmod 755 {} \;
-find $DOCBOOK_INSTALL_DIR -type f -exec chmod 644 {} \;
-chown -R root:root $DOCBOOK_INSTALL_DIR 
+mkdir -p /etc/xml
 
 /usr/bin/$SOURCE2 --prefix=/etc/xml --version=4.1.2
 /usr/bin/$SOURCE2 --prefix=/etc/xml --version=4.2
@@ -24,10 +8,6 @@ chown -R root:root $DOCBOOK_INSTALL_DIR
 
 (
 
-xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V4.1.2//EN" \
-    "file:///usr/share/sgml/docbook/xml/4.1.2/docbookx.dtd" \
-    /etc/xml/docbook &&
 xmlcatalog --noout --add "delegateSystem" \
     "http://www.oasis-open.org/" \
     "file:///usr/share/sgml" /etc/xml/catalog &&
@@ -36,12 +16,14 @@ xmlcatalog --noout --add "delegateURI" \
     "file:///usr/share/sgml" /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org" \
-    "file:///usr/share/sgml" \
-    /etc/xml/docbook &&
+    "file:///usr/share/sgml" /etc/xml/catalog &&
 xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org" \
-    "file:///usr/share/sgml" \
-    /etc/xml/docbook
+    "file:///usr/share/sgml" /etc/xml/catalog
+
 )
 
+# Clean up wrongly added sgml to xml (fixes scrollkeeper)
+sedit '/sgml\/docbook\/sgml/d' /etc/xml/docbook
+
 if module_installed scrollkeeper; then lin -c scrollkeeper; fi
diff --git a/doc-tools/docbook-xml/PRE_BUILD b/doc-tools/docbook-xml/PRE_BUILD
index dba19ab..c84f044 100644
--- a/doc-tools/docbook-xml/PRE_BUILD
+++ b/doc-tools/docbook-xml/PRE_BUILD
@@ -7,8 +7,7 @@ unzip $SOURCE_CACHE/$SOURCE5 -d $SOURCE_DIRECTORY/4.2 &&
 unzip $SOURCE_CACHE/$SOURCE1 -d $SOURCE_DIRECTORY/4.3 &&
 unzip $SOURCE_CACHE/$SOURCE6 -d $SOURCE_DIRECTORY/4.4 &&
 unzip $SOURCE_CACHE/$SOURCE3 -d $SOURCE_DIRECTORY/4.5 &&
-mkdir old.libraries &&
-touch old.libraries/dontbreak &&
+#Remove old directory structure
 CENTRALIZED=/etc/sgml/catalog
 for DOCBOOK_INSTALL_DIR in `ls -d /usr/share/sgml/docbook/docbook-xml* 2>/dev/null`
 do install-catalog -r $CENTRALIZED $DOCBOOK_INSTALL_DIR/catalog; done