2 files changed, 50 insertions, 14 deletions
diff --git a/source/l/shared-mime-info/doinst.sh b/source/l/shared-mime-info/doinst.sh
index bce08d41..38726225 100644
--- a/source/l/shared-mime-info/doinst.sh
+++ b/source/l/shared-mime-info/doinst.sh
@@ -1,4 +1,19 @@
+#!/bin/sh
 if [ -x /usr/bin/update-mime-database ]; then
-  chroot . /usr/bin/update-mime-database /usr/share/mime 1>/dev/null 2>/dev/null
+  /usr/bin/update-mime-database /usr/share/mime 1>/dev/null 2>/dev/null
+  cat /etc/passwd | while read passwdline ; do
+    homedir=$(echo $passwdline | cut -f 6 -d :)
+    if [ -d $homedir/.local/share/mime ]; then
+      username=$(echo $passwdline | cut -f 1 -d :)
+      # Sorry about the long command line, alienBOB  ;-)
+      su $username -c "/usr/bin/update-mime-database $homemimedir 1>/dev/null 2>/dev/null" 2> /dev/null
+    fi
+  done
+  # This is just "cleanup" in case something might be missed in /home/*/
+  for homemimedir in /home/*/.local/share/mime ; do
+    if [ -d $homemimedir ]; then
+      username=$(echo $homemimedir | cut -f 3 -d /)
+      su $username -c "/usr/bin/update-mime-database $homemimedir 1>/dev/null 2>/dev/null" 2> /dev/null
+    fi
+  done
 fi
-
diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild
index 99952735..81d5f01b 100755
--- a/source/l/shared-mime-info/shared-mime-info.SlackBuild
+++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,12 +21,22 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-0.60}
-ARCH=${ARCH:-x86_64}
+PKGNAM=shared-mime-info
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -36,19 +46,22 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
-PKG=$TMP/package-shared-mime-info
+PKG=$TMP/package-${PKGNAM}
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $TMP
-rm -rf shared-mime-info-$VERSION
-tar xvf $CWD/shared-mime-info-$VERSION.tar.bz2 || exit 1
-cd shared-mime-info-$VERSION || exit 1
+rm -rf ${PKGNAM}-$VERSION
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
+cd ${PKGNAM}-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -60,7 +73,7 @@ CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
-  --docdir=/usr/doc/shared-mime-info-$VERSION \
+  --docdir=/usr/doc/${PKGNAM}-$VERSION \
   --disable-update-mimedb \
   --build=$ARCH-slackware-linux
 
@@ -85,16 +98,24 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-mkdir -p $PKG/usr/doc/shared-mime-info-$VERSION
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
   COPYING* HACKING NEWS README* \
-  $PKG/usr/doc/shared-mime-info-$VERSION
-chmod 644 $PKG/usr/doc/shared-mime-info-$VERSION/*
+  $PKG/usr/doc/${PKGNAM}-$VERSION
+chmod 644 $PKG/usr/doc/${PKGNAM}-$VERSION/*
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/shared-mime-info-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz