PKGBUILD cleanup and tests

1 files changed, 9 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c4efc43f8bca..ce4a0f9512bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer : George Eleftheriou <eleftg>
 # Contributor: Jingbei Li <petronny>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -13,7 +12,7 @@ _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}-java
 pkgver=1.10.2
-pkgrel=2
+pkgrel=3
 pkgdesc="General purpose library and file format for storing scientific data (${_mpi} version) (full version including its Java Native Interfaces)"
 arch=('x86_64')
 url="https://www.hdfgroup.org/HDF5/"
@@ -23,13 +22,13 @@ makedepends=('time' 'gcc-fortran' 'java-environment')
 provides=('hdf5-openmpi' 'hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
 conflicts=('hdf5' 'hdf5-openmpi')
 replaces=("hdf5-fortran-${_mpi}")
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2"
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
         'mpi.patch')
 md5sums=('41fb9347801b546fba323523a1c1af51'
          'dfa8dd50b8a7ebb3ad7249c627156cf9')
 
 prepare() {
-    cd ${_pkgname}-${pkgver/_/-}
+    cd ${_pkgname}-${pkgver}
 
     # Fix building with GCC 8.1
     sed 's/\(.*\)(void) HDF_NO_UBSAN/HDF_NO_UBSAN \1(void)/' -i src/H5detect.c
@@ -39,7 +38,8 @@ prepare() {
 }
 
 build() {
-    cd ${_pkgname}-${pkgver/_/-}
+    cd ${_pkgname}-${pkgver}
+
     ./configure \
         CXX="mpicxx" \
         CC="mpicc" \
@@ -62,26 +62,20 @@ build() {
         --with-pic \
         --with-zlib \
         --with-szlib
+
     make
 }
 
 check() {
-    cd ${_pkgname}-${pkgver/_/-}
-    # Without exporting LD_LIBRARY_PATH, tests fail being unable to
-    # locate the newly built (not installed yet) hdf5 runtime
-    export LD_LIBRARY_PATH="${srcdir}"/${pkgname}-${pkgver/_/-}/src/.libs/
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/c++/src/.libs/
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/fortran/src/.libs/
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/src/.libs/
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/c++/src/.libs/
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"${srcdir}"/${pkgname}-${pkgver/_/-}/hl/fortran/src/.libs/
+    cd ${_pkgname}-${pkgver}
+
     # This is a parallel build, there will always be some OpenMPI bugs,
     # so skip failures and don't kill the entire packaging process
     make check || warning "Some tests failed"
 }
 
 package() {
-    cd ${_pkgname}-${pkgver/_/-}
+    cd ${_pkgname}-${pkgver}
 
     make -j1 DESTDIR="${pkgdir}" install