4 files changed, 38 insertions, 35 deletions
diff --git a/misc/gnome-doc-utils/README b/misc/gnome-doc-utils/README
index acade7e13b8f9..cbd5eb775cf10 100644
--- a/misc/gnome-doc-utils/README
+++ b/misc/gnome-doc-utils/README
@@ -1,6 +1,6 @@
-gnome-doc-utils is a collection of documentation utilities
-for the project. Notably, it contains utilities for building
-documentation and all auxiliary files in your source tree,
-and it contains the DocBook XSLT stylesheets that were once
-distributed with Yelp. Starting with Gnome 2.8, Yelp will
-require gnome-doc-utils for the XSLT.
+gnome-doc-utils is a collection of documentation utilities for the
+project. Notably, it contains utilities for building documentation
+and all auxiliary files in your source tree, and it contains the
+DocBook XSLT stylesheets that were once distributed with Yelp.
+Starting with Gnome 2.8, Yelp will require gnome-doc-utils for
+the XSLT.
diff --git a/misc/gnome-doc-utils/gnome-doc-utils.SlackBuild b/misc/gnome-doc-utils/gnome-doc-utils.SlackBuild
index cc5e095afbcd1..01f3d32434363 100644
--- a/misc/gnome-doc-utils/gnome-doc-utils.SlackBuild
+++ b/misc/gnome-doc-utils/gnome-doc-utils.SlackBuild
@@ -9,7 +9,7 @@
 # Script maintained by Frank Caraballo <fecaraballo{at}gmail{dot}com>
 
 PRGNAM=gnome-doc-utils
-VERSION=0.12.2
+VERSION=${VERSION:-0.16.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -19,16 +19,22 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Exit on most errors
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -37,28 +43,25 @@ find . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
+  --localstatedir=/var \
   --mandir=/usr/man \
-  --disable-scrollkeeper
+  --disable-scrollkeeper \
+  --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+make install-strip DESTDIR=$PKG
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README COPYING AUTHORS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING* INSTALL NEWS README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/gnome-doc-utils/gnome-doc-utils.info b/misc/gnome-doc-utils/gnome-doc-utils.info
index 3fb5cc6b0650e..09618e7d97d13 100644
--- a/misc/gnome-doc-utils/gnome-doc-utils.info
+++ b/misc/gnome-doc-utils/gnome-doc-utils.info
@@ -1,8 +1,8 @@
 PRGNAM="gnome-doc-utils"
-VERSION="0.12.2"
+VERSION="0.16.0"
 HOMEPAGE="http://live.gnome.org/DocumentationProject"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.12/gnome-doc-utils-0.12.2.tar.bz2"
-MD5SUM="e1a9e9ba923b8950f8803c90ebeaadb8"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.16/gnome-doc-utils-0.16.0.tar.bz2"
+MD5SUM="45971197fd48147ee928462d5b74f234"
 MAINTAINER="Frank Caraballo"
 EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="David Somero"
+APPROVED="rworkman"
diff --git a/misc/gnome-doc-utils/slack-desc b/misc/gnome-doc-utils/slack-desc
index 629690ff65d5c..56a356599910e 100644
--- a/misc/gnome-doc-utils/slack-desc
+++ b/misc/gnome-doc-utils/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
 
-               |-----handy-ruler------------------------------------------------------|
+               |-----handy-ruler-------------------------------------------------------|
 gnome-doc-utils: gnome-doc-utils (collection of documentation utilities)
 gnome-doc-utils:
-gnome-doc-utils: gnome-doc-utils is a collection of documentation utilities
-gnome-doc-utils: for the project. Notably, it contains utilities for building
-gnome-doc-utils: documentation and all auxiliary files in your source tree,
-gnome-doc-utils: and it contains the DocBook XSLT stylesheets that were once
-gnome-doc-utils: distributed with Yelp. Starting with Gnome 2.8, Yelp will
-gnome-doc-utils: require gnome-doc-utils for the XSLT.
+gnome-doc-utils: gnome-doc-utils is a collection of documentation utilities for the
+gnome-doc-utils: project. Notably, it contains utilities for building documentation
+gnome-doc-utils: and all auxiliary files in your source tree, and it contains the
+gnome-doc-utils: DocBook XSLT stylesheets that were once distributed with Yelp.
+gnome-doc-utils: Starting with Gnome 2.8, Yelp will require gnome-doc-utils for
+gnome-doc-utils: the XSLT.
 gnome-doc-utils:
 gnome-doc-utils: Homepage: http://live.gnome.org/DocumentationProject
 gnome-doc-utils: