Accepting request 534352 from home:eeich:hpc_alt

- Convert package to multibuild.
- Add HPC build using environment modules 
  (FATE#321717, FATE#321710).

OBS-URL: https://build.opensuse.org/request/show/534352
OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=44

_multibuild

@@ -0,0 +1,8 @@
+<multibuild>
+  <package>serial</package>
+  <package>openmpi</package>
+  <package>mvapich2</package>
+  <package>gnu-openmpi-hpc</package>
+  <package>gnu-mvapich2-hpc</package>
+  <package>gnu-hpc</package>
+</multibuild>

baselibs.conf

@@ -1,34 +0,0 @@
-libhdf5-100
-libhdf5-100-openmpi
-libhdf5-100-mvapich2
-libhdf5_hl100
-libhdf5_hl100-mvapich2
-libhdf5_hl100-openmpi
-libhdf5_cpp100
-libhdf5_hl_cpp100
-libhdf5_fortran100
-libhdf5_fortran100-openmpi
-libhdf5_fortran100-mvapich2
-libhdf5hl_fortran100
-libhdf5hl_fortran100-mvapich2
-libhdf5hl_fortran100-openmpi
-hdf5-devel
-  requires -<targettype>
-  requires "libhdf5-100-<targettype> = <version>"
-  requires "libhdf5_hl100-<targettype> = <version>"
-  requires "libhdf5_cpp100-<targettype> = <version>"
-  requires "libhdf5_hl_cpp100-<targettype> = <version>"
-  requires "libhdf5_fortran100-<targettype> = <version>"
-  requires "libhdf5hl_fortran100-<targettype> = <version>"
-hdf5-openmpi-devel
-  requires -openmpi-<targettype>
-  requires "libhdf5-100-openmpi-<targettype> = <version>"
-  requires "libhdf5_hl100-openmpi-<targettype> = <version>"
-  requires "libhdf5_fortran100-openmpi-<targettype> = <version>"
-  requires "libhdf5hl_fortran100-openmpi-<targettype> = <version>"
-hdf5-mvapich2-devel
-  requires -openmpi-<targettype>
-  requires "libhdf5-100-mvapich2-<targettype> = <version>"
-  requires "libhdf5_hl100-mvapich2-<targettype> = <version>"
-  requires "libhdf5_fortran100-mvapich2-<targettype> = <version>"
-  requires "libhdf5hl_fortran100-mvapich2-<targettype> = <version>"

baselibs.conf.in

@@ -1,34 +0,0 @@
-libhdf5-@sonum@
-libhdf5-@sonum@-openmpi
-libhdf5-@sonum@-mvapich2
-libhdf5_hl@sonum_HL@
-libhdf5_hl@sonum_HL@-mvapich2
-libhdf5_hl@sonum_HL@-openmpi
-libhdf5_cpp@sonum_CXX@
-libhdf5_hl_cpp@sonum_HL_CXX@
-libhdf5_fortran@sonum_F@
-libhdf5_fortran@sonum_F@-openmpi
-libhdf5_fortran@sonum_F@-mvapich2
-libhdf5hl_fortran@sonum_HL_F@
-libhdf5hl_fortran@sonum_HL_F@-mvapich2
-libhdf5hl_fortran@sonum_HL_F@-openmpi
-hdf5-devel
-  requires -<targettype>
-  requires "libhdf5-@sonum@-<targettype> = <version>"
-  requires "libhdf5_hl@sonum_HL@-<targettype> = <version>"
-  requires "libhdf5_cpp@sonum_CXX@-<targettype> = <version>"
-  requires "libhdf5_hl_cpp@sonum_HL_CXX@-<targettype> = <version>"
-  requires "libhdf5_fortran@sonum_F@-<targettype> = <version>"
-  requires "libhdf5hl_fortran@sonum_HL_F@-<targettype> = <version>"
-hdf5-openmpi-devel
-  requires -openmpi-<targettype>
-  requires "libhdf5-@sonum@-openmpi-<targettype> = <version>"
-  requires "libhdf5_hl@sonum_HL@-openmpi-<targettype> = <version>"
-  requires "libhdf5_fortran@sonum_F@-openmpi-<targettype> = <version>"
-  requires "libhdf5hl_fortran@sonum_HL_F@-openmpi-<targettype> = <version>"
-hdf5-mvapich2-devel
-  requires -openmpi-<targettype>
-  requires "libhdf5-@sonum@-mvapich2-<targettype> = <version>"
-  requires "libhdf5_hl@sonum_HL@-mvapich2-<targettype> = <version>"
-  requires "libhdf5_fortran@sonum_F@-mvapich2-<targettype> = <version>"
-  requires "libhdf5hl_fortran@sonum_HL_F@-mvapich2-<targettype> = <version>"

hdf5.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep  8 14:35:32 UTC 2017 - eich@suse.com
+
+- Convert package to multibuild.
+- Add HPC build using environment modules 
+  (FATE#321717, FATE#321710).
+
 -------------------------------------------------------------------
 Tue Aug 29 12:03:27 UTC 2017 - hpj@urpla.net
 

update_so_version.sh

@@ -13,8 +13,8 @@ dbg()
 
 cleanup()
 {
-	rm -f lt_vers.sh sonum_spec.sed sonum_baselibs.sed
-	rm -f hdf5.spec.tmp baselibs.conf.tmp
+	rm -f lt_vers.sh sonum_spec.sed
+	rm -f hdf5.spec.tmp
 }
 
 ## We are going to parse these variables from tarball:
@@ -54,9 +54,8 @@ for infix in "" _CXX _F _HL _HL_CXX _HL_F _TOOLS; do
 	test "${!var}" -gt 0 || exit_error "$var='${!var}' bad or undefined"
 	dbg "update $var=${!var}"
 	def_sonum="sonum${infix}"
-	# create sed scripts for spec file and baselibs 
+	# create sed scripts for spec file
 	echo "s/^%define $def_sonum .*/%define $def_sonum ${!var}/" >> sonum_spec.sed
-	echo "s/@${def_sonum}@/${!var}/g" >> sonum_baselibs.sed
 done
 
 # update spec file if needed
@@ -68,13 +67,4 @@ else
 	echo "hdf5.spec updated" >&2
 fi
 
-# update baselibs if needed
-sed -f sonum_baselibs.sed baselibs.conf.in > baselibs.conf.tmp
-if diff -q baselibs.conf.tmp baselibs.conf &>/dev/null; then
-	dbg "baselibs.conf was up-to-date"
-else
-	mv baselibs.conf.tmp baselibs.conf
-	echo "baselibs.conf updated" >&2
-fi
-
 cleanup