3 files changed, 17 insertions, 16 deletions
diff --git a/libraries/hdf5/hdf5.SlackBuild b/libraries/hdf5/hdf5.SlackBuild
index 0a2dc6314d..f9faa45b9e 100644
--- a/libraries/hdf5/hdf5.SlackBuild
+++ b/libraries/hdf5/hdf5.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=hdf5
-VERSION=${VERSION:-1.8.3}
+VERSION=${VERSION:-1.8.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -44,16 +44,15 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
-DOCFILES="COPYING MANIFEST README.txt release_docs/RELEASE.txt \
-  release_docs/HISTORY-1_8.txt"
+DOCFILES="COPYING MANIFEST README.txt release_docs/RELEASE.txt release_docs/HISTORY-1_8.txt"
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -82,7 +81,7 @@ install -m 0644 $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Remove unnecessary stuff
-rm -f $PKG/usr/lib/*.settings
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.settings
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -91,4 +90,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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/hdf5/hdf5.info b/libraries/hdf5/hdf5.info
index ac333d8611..52312e0459 100644
--- a/libraries/hdf5/hdf5.info
+++ b/libraries/hdf5/hdf5.info
@@ -1,8 +1,10 @@
 PRGNAM="hdf5"
-VERSION="1.8.3"
+VERSION="1.8.4"
 HOMEPAGE="http://hdf.ncsa.uiuc.edu/products/hdf5/"
-DOWNLOAD="ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-1.8.3.tar.gz"
-MD5SUM="5ce228d860bf9e797ca40ab1a823c380"
+DOWNLOAD="ftp://ftp.hdfgroup.org/HDF5/current/src/hdf5-1.8.4.tar.bz2"
+MD5SUM="c13599cfff871948f4d00e19ac410b86"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/libraries/hdf5/slack-desc b/libraries/hdf5/slack-desc
index 0ce6080d7a..7578710583 100644
--- a/libraries/hdf5/slack-desc
+++ b/libraries/hdf5/slack-desc
@@ -7,13 +7,13 @@
 
     |-----handy-ruler---------------------------------------------------------|
 hdf5: hdf5 (HDF5 software libraries and utilities)
-hdf5: 
+hdf5:
 hdf5: Hierarchical Data Format 5 defines a file format and and provides a
 hdf5: software library for storing arbitrary multidimensional datasets of
 hdf5: various types. hdf5 provides also c++ and fortran interfaces.
 hdf5: It is released under a BSD-ish license.
-hdf5: 
+hdf5:
 hdf5: Homepage: http://hdf.ncsa.uiuc.edu/products/hdf5/
-hdf5: 
-hdf5: 
-hdf5: 
+hdf5:
+hdf5:
+hdf5: