[arch-commits] Commit in hdf5-openmpi/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Saturday, April 11, 2020 @ 00:29:34
  Author: archange
Revision: 613200

upgpkg: hdf5-openmpi 1.12.0-1

Patch has been finally upstreamed

Modified:
  hdf5-openmpi/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-10 23:43:49 UTC (rev 613199)
+++ PKGBUILD	2020-04-11 00:29:34 UTC (rev 613200)
@@ -9,29 +9,21 @@
 _pkgname=hdf5
 _mpi=openmpi
 pkgname=${_pkgname}-${_mpi}
-pkgver=1.10.5
+pkgver=1.12.0
 pkgrel=1
 pkgdesc="General purpose library and file format for storing scientific data (${_mpi} version)"
-arch=('x86_64')
+arch=(x86_64)
 url="https://www.hdfgroup.org/hdf5"
-license=('custom')
-depends=('zlib' 'libaec' 'bash' 'openmpi')
-makedepends=('cmake' 'time' 'gcc-fortran')
-provides=('hdf5' 'hdf5-cpp-fortran' "hdf5-fortran-${_mpi}")
-conflicts=('hdf5')
-replaces=("hdf5-fortran-${_mpi}")
-options=('staticlibs')
-source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2"
-        'mpi.patch')
-sha256sums=('68d6ea8843d2a106ec6a7828564c1689c7a85714a35d8efafa2fee20ca366f44'
-            '603006358175b7a8b35fa44c484cddf45c0381cf50db4fb7c50ea5969d361eca')
+license=(custom)
+depends=(zlib libaec bash ${_mpi})
+makedepends=(cmake time gcc-fortran)
+provides=(hdf5 hdf5-cpp-fortran hdf5-fortran-${_mpi})
+conflicts=(hdf5)
+replaces=(hdf5-fortran-${_mpi})
+options=(staticlibs)
+source=("https://support.hdfgroup.org/ftp/HDF5/releases/${_pkgname}-${pkgver:0:4}/${_pkgname}-${pkgver/_/-}/src/${_pkgname}-${pkgver/_/-}.tar.bz2")
+sha256sums=('97906268640a6e9ce0cde703d5a71c9ac3092eded729591279bf2e3ca9765f61')
 
-prepare() {
-    cd ${_pkgname}-${pkgver/_/-}
-    # FS#33343
-    patch -p1 -i ../mpi.patch
-}
-
 build() {
     # Crazy workaround: run CMake to generate pkg-config file
     mkdir -p build && cd build
@@ -64,6 +56,7 @@
         OMPI_MCA_disable_memory_allocator=1 \
         --prefix=/usr \
         --docdir=/usr/share/doc/hdf5/ \
+        --with-examplesdir='${DESTDIR}/${prefix}/share/doc/hdf5/examples' \
         --enable-static \
         --disable-sharedlib-rpath \
         --enable-build-mode=production \
@@ -93,15 +86,8 @@
 
 package() {
     cd ${_pkgname}-${pkgver/_/-}
-
     make DESTDIR="${pkgdir}" install
-
-    # Move examples to a proper place
-    install -dm755 "${pkgdir}"/usr/share/doc/${_pkgname}
-    mv "${pkgdir}"/usr/share/{hdf5_examples,doc/${_pkgname}/examples}
-
     install -Dm644 COPYING -t "${pkgdir}"/usr/share/licenses/${_pkgname}
-
     # Install pkg-config files from CMake tree
     install -Dm644 ../build/CMakeFiles/hdf5{,_hl}{,_cpp}-${pkgver}.pc -t "${pkgdir}"/usr/lib/pkgconfig/
 }