3 files changed, 20 insertions, 10 deletions
diff --git a/python/hachoir-core/README b/python/hachoir-core/README
index 26904f6aa2..3159f59c4d 100644
--- a/python/hachoir-core/README
+++ b/python/hachoir-core/README
@@ -1,5 +1,5 @@
 hachoir-core
 
-Hachoir is a Python library used to represent of a binary file as a tree of 
-Python objects. Each object has a type, a value, an address, etc. The goal is 
-to be able to know the meaning of each bit in a file.
+Hachoir is a Python library used to represent of a binary file as a
+tree of Python objects. Each object has a type, a value, an address,
+etc. The goal is to be able to know the meaning of each bit in a file.
diff --git a/python/hachoir-core/hachoir-core.SlackBuild b/python/hachoir-core/hachoir-core.SlackBuild
index e7a8a617dd..5fb91073e7 100644
--- a/python/hachoir-core/hachoir-core.SlackBuild
+++ b/python/hachoir-core/hachoir-core.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for hachoir-core
 # Copyright 2014  Barry Grundy <bgrundy[at]linuxleo.com>
@@ -23,26 +23,36 @@
 #
 # Initial Build - November 2014 version 1.3.3
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=hachoir-core
 VERSION=${VERSION:-1.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -82,4 +92,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/python/hachoir-core/hachoir-core.info b/python/hachoir-core/hachoir-core.info
index afa448070f..6bbeba0bae 100644
--- a/python/hachoir-core/hachoir-core.info
+++ b/python/hachoir-core/hachoir-core.info
@@ -1,7 +1,7 @@
 PRGNAM="hachoir-core"
 VERSION="1.3.3"
 HOMEPAGE="https://pypi.python.org/pypi/hachoir-core"
-DOWNLOAD="https://pypi.python.org/packages/source/h/hachoir-core/hachoir-core-1.3.3.tar.gz"
+DOWNLOAD="https://slackware.uk/sbosrcarch/by-md5/b/8/b80f0257536e2b2cb23f66670c4f6f31/hachoir-core-1.3.3.tar.gz"
 MD5SUM="b80f0257536e2b2cb23f66670c4f6f31"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""