upgraded to 1.10.3

2 files changed, 19 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dbe9a3112224..57f0df3fff9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = hdf5-openmpi-java
 	pkgdesc = General purpose library and file format for storing scientific data (openmpi version) (full version including its Java Native Interfaces)
-	pkgver = 1.10.2
-	pkgrel = 3
-	url = https://www.hdfgroup.org/HDF5/
+	pkgver = 1.10.3
+	pkgrel = 1
+	url = https://portal.hdfgroup.org/display/support
 	arch = x86_64
 	license = custom
 	makedepends = time
@@ -10,7 +10,6 @@ pkgbase = hdf5-openmpi-java
 	makedepends = java-environment
 	depends = zlib
 	depends = libaec
-	depends = bash
 	depends = openmpi
 	provides = hdf5-openmpi
 	provides = hdf5
@@ -19,9 +18,9 @@ pkgbase = hdf5-openmpi-java
 	conflicts = hdf5
 	conflicts = hdf5-openmpi
 	replaces = hdf5-fortran-openmpi
-	source = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.2/src/hdf5-1.10.2.tar.bz2
+	source = https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.3/src/hdf5-1.10.3.tar.bz2
 	source = mpi.patch
-	md5sums = 41fb9347801b546fba323523a1c1af51
+	md5sums = 56c5039103c51a40e493b43c504ce982
 	md5sums = dfa8dd50b8a7ebb3ad7249c627156cf9
 
 pkgname = hdf5-openmpi-java
diff --git a/PKGBUILD b/PKGBUILD
index ce4a0f9512bc..b5c0ecb3753f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,36 +11,34 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}-java
-pkgver=1.10.2
-pkgrel=3
+pkgver=1.10.3
+pkgrel=1
 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/"
+url="https://portal.hdfgroup.org/display/support"
 license=('custom')
-depends=('zlib' 'libaec' 'bash' 'openmpi')
+depends=('zlib' 'libaec' "${_mpi}")
 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"
         'mpi.patch')
-md5sums=('41fb9347801b546fba323523a1c1af51'
+md5sums=('56c5039103c51a40e493b43c504ce982'
          'dfa8dd50b8a7ebb3ad7249c627156cf9')
 
 prepare() {
-    cd ${_pkgname}-${pkgver}
-
-    # Fix building with GCC 8.1
-    sed 's/\(.*\)(void) HDF_NO_UBSAN/HDF_NO_UBSAN \1(void)/' -i src/H5detect.c
+    [ ! -d build ] && mkdir -p build
+    cd "${_pkgname}-${pkgver}"
 
     # FS#33343
     patch -p1 -i ../mpi.patch
 }
 
 build() {
-    cd ${_pkgname}-${pkgver}
+    cd build
 
-    ./configure \
+    "${srcdir}/${_pkgname}-${pkgver}"/configure \
         CXX="mpicxx" \
         CC="mpicc" \
         FC="mpif90" \
@@ -49,7 +47,6 @@ build() {
         OMPI_MCA_disable_memory_allocator=1 \
         JAVADOC='javadoc -Xdoclint:none' \
         --prefix=/usr \
-        --docdir=/usr/share/doc/hdf5 \
         --disable-static \
         --disable-sharedlib-rpath \
         --enable-build-mode=production \
@@ -67,20 +64,20 @@ build() {
 }
 
 check() {
-    cd ${_pkgname}-${pkgver}
+    cd build
 
-    # This is a parallel build, there will always be some OpenMPI bugs,
+    # This is a parallel build, there will always be some MPI bugs,
     # so skip failures and don't kill the entire packaging process
     make check || warning "Some tests failed"
 }
 
 package() {
-    cd ${_pkgname}-${pkgver}
+    cd build
 
     make -j1 DESTDIR="${pkgdir}" install
 
-    install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
+    install -dm755 "${pkgdir}/usr/share/doc/${_pkgname}"
     mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}
 
-    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${_pkgname}/LICENSE
+    install -Dm644 "${srcdir}/${_pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }