Include the cambria.ttc font collection file;

Add SlackBuild script to the docdir; better way of determining the SRCDIR

1 files changed, 14 insertions, 6 deletions

diff --git a/msofficefonts/build/msofficefonts.SlackBuild b/msofficefonts/build/msofficefonts.SlackBuild
index 2f6ec7b7..eb2d022a 100755
--- a/msofficefonts/build/msofficefonts.SlackBuild
+++ b/msofficefonts/build/msofficefonts.SlackBuild
@@ -32,6 +32,9 @@
 # Changelog:  
 # 2007-1:    16/Apr/2008 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
+# 2007-2:    26/jul/2008 by Eric Hameleers <alien@slackware.com>
+#            * Include the cambria.ttc font collection as well (thanks to
+#              Dusan Stefanovic for the suggestion).
 # 
 # Run 'sh msofficefonts.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -44,12 +47,10 @@
 PRGNAM=msofficefonts
 VERSION=${VERSION:-2007}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Where do we look for sources?
-CWD=$(pwd)
-SRCDIR=$(dirname $0)
-[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+SRCDIR=$(cd $(dirname $0); pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
@@ -60,6 +61,8 @@ SOURCE="$SRCDIR/PowerPointViewer.exe"
 # Download page is http://www.microsoft.com/downloads/details.aspx?familyid=048DC840-14E1-467D-8DCA-19D2A8FD7485&displaylang=en
 SRCURL="http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe"
 
+DOCS="eula.txt $SRCDIR/README.1st"
+
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
@@ -132,10 +135,13 @@ mkdir -p $PKG$FONTDIR
 
 cd $TMP/tmp-$PRGNAM
 mkdir -p cab-contents
+cabextract --lowercase -F eula.txt ${SOURCE}
 cabextract --lowercase --directory=cab-contents -F ppviewer.cab ${SOURCE}
-cabextract --lowercase --directory=cab-contents -F eula.txt ${SOURCE}
 for i in cab-contents/*.cab ; do
+  cabextract --lowercase --directory=cab-contents -F *.TTC $i
+  cabextract --lowercase --directory=cab-contents -F *.ttc $i
   cabextract --lowercase --directory=cab-contents -F *.TTF $i
+  cabextract --lowercase --directory=cab-contents -F *.ttf $i
 done
 
 chown -R root:root .
@@ -159,7 +165,9 @@ cat <<-EOT > $PKG/install/doinst.sh
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a cab-contents/eula.txt $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
 # Add a package description: