From 4761b5a61275c49f8ac3e7ca58080dbf83c9e689 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Fri, 2 Jun 2006 20:27:01 +0000
Subject: [PATCH] Added template book.xsl file. Fixed a few dependencies.

---
 BLFS/libs/book.xsl          | 13 +++++++++++++
 BLFS/libs/func_dependencies | 15 +++++++++++----
 BLFS/libs/func_parser       |  3 +--
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 BLFS/libs/book.xsl

diff --git a/BLFS/libs/book.xsl b/BLFS/libs/book.xsl
new file mode 100644
index 0000000..bf35dbe
--- /dev/null
+++ b/BLFS/libs/book.xsl
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://www.w3.org/1999/xhtml"
+                version="1.0">
+
+<!-- $Id$ -->
+
+  <!-- NOTE: the base dir (blfs-xml) must be changed to FAKEDIR on the
+  final version and set it to the proper dir via a sed in ./blfs -->
+  <xsl:import href="../blfs-xml/stylesheets/blfs-chunked.xsl"/>
+
+</xsl:stylesheet>
diff --git a/BLFS/libs/func_dependencies b/BLFS/libs/func_dependencies
index d9d4c97..96d668e 100644
--- a/BLFS/libs/func_dependencies
+++ b/BLFS/libs/func_dependencies
@@ -46,6 +46,8 @@ inline_doc
 
   #---------------------
   # The BLFS sources directory.
+  # Note: for book.xsl this value must be set via a sed in ./blfs.
+  # For consistency, we should to do the same here.
   BLFS_XML=`echo $PKGXML | sed -e 's,/.*,,'`
 
   if [[ ! -d ../$BLFS_XML ]] ; then
@@ -195,13 +197,18 @@ inline_doc
 
       db ) # The proper version of DB is installed in LFS
         continue ;;
-      hal-requirements | hal-runtime-dependencies ) # Don't have their own XML file
+
+        # Don't have their own XML file
+      hal-requirements | hal-runtime-dependencies )
         continue ;;
-      perl-* | tk-perl )  DEP=perl-modules ;;
 
         # Orphan links (proper link must be created when generating the book)
-      arts )              DEP=aRts ;;
-      kde )               DEP=kde-core ;;
+      arts )                     DEP=aRts ;;
+      kde )                      DEP=kde-core ;;
+      perl-* | tk-perl )         DEP=perl-modules ;;
+      GNOME-desktop-file-utils ) DEP=desktop-file-utils ;;
+      GNOME-shared-mime-info )   DEP=shared-mime-info ;;
+
         # Set values for alternative packages
         # X is a meta-package, thus handled in another way.
       LPRng | cups )      DEP=$PRINT_SERVER ;;
diff --git a/BLFS/libs/func_parser b/BLFS/libs/func_parser
index 950c239..4d0d9ae 100644
--- a/BLFS/libs/func_parser
+++ b/BLFS/libs/func_parser
@@ -99,8 +99,7 @@ inline_doc
 
   echo -en  "\tGenerating the HTML book ..."
   xsltproc --xinclude --nonet --stringparam base.dir HTML/ \
-           --stringparam chunk.quietly 1 \
-           ../$BLFS_XML/stylesheets/blfs-chunked.xsl \
+           ../libs/book.xsl \
            $TARGET-index.xml > xsltproc.log 2>&1
 
   mkdir HTML/{stylesheets,images}