Merge pull request #6478 from Rmys/master

hdf5 ver bump close #6371

science/misc/hdf5/actions.py

@@ -7,9 +7,20 @@
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import cmaketools
 from pisi.actionsapi import get
 
 def setup():
+    shelltools.makedirs("build")
+    shelltools.cd("build") 
+    cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \
+                          -DBUILD_SHARED_LIBS=ON \
+                          -DCMAKE_BUILD_TYPE=Release \
+                          -DHDF5_BUILD_HL_LIB=ON \
+                          -DHDF5_BUILD_CPP_LIB=ON \
+                          -DHDF5_BUILD_FORTRAN=ON", sourceDir="..")
+    
+    shelltools.cd("..")
     autotools.configure("--prefix=/usr \
                          --enable-cxx \
                          --enable-hl \
@@ -33,5 +44,6 @@ def build():
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-
+    
+    pisitools.insinto("/usr/lib/pkgconfig", "build/CMakeFiles/*.pc")
     pisitools.dodoc("ACKNOWLEDGMENTS", "COPYING", "README*", "release_docs/HISTORY-*", "release_docs/RELEASE.txt")

science/misc/hdf5/pspec.xml

@@ -3,7 +3,7 @@
 <PISI>
     <Source>
         <Name>hdf5</Name>
-        <Homepage>http://www.hdfgroup.org/HDF5/</Homepage>
+        <Homepage>https://www.hdfgroup.org/HDF5/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -13,9 +13,10 @@
         <IsA>library</IsA>
         <Summary>NCSA Hierarchical Data Format (HDF) Software Library and Utilities</Summary>
         <Description>HDF5 is a general purpose library and file format for storing scientific data.</Description>
-        <Archive sha1sum="22edee1f4ed603ea9544daec3492874fa3028bbb" type="tarbz2">https://support.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.10.1.tar.bz2</Archive>
+        <Archive sha1sum="db7e6ec7becf288149a655598f8cb0c5fb6234d8" type="tarbz2">https://support.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.10.4.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>time</Dependency>
+            <Dependency>cmake</Dependency>
             <Dependency>libgfortran</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>net-tools</Dependency>
@@ -45,10 +46,18 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2019-02-03</Date>
+            <Version>1.10.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="4">
             <Date>2018-08-05</Date>
             <Version>1.10.1</Version>