Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2018-11-26 10:28:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5" Mon Nov 26 10:28:40 2018 rev:50 rq:651201 version:1.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2018-11-19 23:33:49.155064120 +0100 +++ /work/SRC/openSUSE:Factory/.hdf5.new.19453/hdf5.changes 2018-11-26 10:29:08.173110317 +0100 @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 22 18:15:55 UTC 2018 - Stefan Brüns <[email protected]> + +- Build HDF5 C++ bindings also for the MPI variants, there is no reason + not to do it. +- Enable sz2 support also for MPI variants. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.JwE4v9/_old 2018-11-26 10:29:08.897109468 +0100 +++ /var/tmp/diff_new_pack.JwE4v9/_new 2018-11-26 10:29:08.901109463 +0100 @@ -314,7 +314,7 @@ This package contains the HDF5 runtime libraries. -%{!?with_mpi:%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_cpp%{hpc_package_name_tail} -N %{pname}_cpp}}} +%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_cpp%{hpc_package_name_tail} -N %{pname}_cpp}} %package -n %{libname -l _hl_cpp -s %{sonum_HL_CXX}} Summary: High-level shared libraries for the HDF5 scientific data format @@ -330,7 +330,7 @@ This package contains the the high-level HDF5 runtime libraries. -%{!?with_mpi:%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_hl_cpp%{hpc_package_name_tail} -N %{pname}_hl_cpp}}} +%{?with_hpc:%{hpc_master_package -l -n lib%{pname}_hl_cpp%{hpc_package_name_tail} -N %{pname}_hl_cpp}} %package -n %{libname -l _fortran -s %{sonum_F}} Summary: Shared libraries for the HDF5 scientific data format @@ -379,10 +379,8 @@ %package devel Summary: Development files for %{name} Group: Development/Libraries/Parallel -%if %{without mpi} Requires: %{libname -l _cpp -s %{sonum_CXX}} = %{version} Requires: %{libname -l _hl_cpp -s %{sonum_HL_CXX}} = %{version} -%endif Requires: %{name} = %{version} Requires: %{pname}-devel-data = %{version} %if 0%{?use_sz2} @@ -463,20 +461,16 @@ libhdf5_hl%{sonum_HL}%{?my_suffix} libhdf5_fortran%{sonum_HL_F}%{?my_suffix} libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix} -%if %{without mpi} libhdf5_cpp%{sonum_CXX}%{?my_suffix} libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix} -%endif hdf5%{?my_suffix}-devel requires %{?my_suffix}-<targettype> requires "libhdf5-%{sonum}%{?my_suffix}-<targettype> = <version>" requires "libhdf5_hl%{sonum_HL}%{?my_suffix}-<targettype> = <version>" requires "libhdf5_fortran%{sonum_HL_F}%{?my_suffix}-<targettype> = <version>" requires "libhdf5hl_fortran%{sonum_HL_F}%{?my_suffix}-<targettype> = <version>" -%if %{without mpi} requires "libhdf5_cpp%{sonum_CXX}%{?my_suffix}-<targettype> = <version>" requires "libhdf5_hl_cpp%{sonum_HL_CXX}%{?my_suffix}-<targettype> = <version>" -%endif EOF %endif @@ -507,6 +501,7 @@ %if %{without hpc} %if %{with mpi} export CC="%{my_bindir}/mpicc" +export CXX="%{my_bindir}/mpicxx" export FC="%{my_bindir}/mpif90" export F77="%{my_bindir}/mpif77" export LD_LIBRARY_PATH="%{my_libdir}" @@ -521,7 +516,7 @@ --datadir=%{_datadir} \ %endif --docdir=%{_docdir}/%{name} \ -%else +%else # hpc %global _hpc_exec_prefix %hpc_exec_prefix %global hpc_exec_prefix %_prefix %if %{with mpi} @@ -535,7 +530,7 @@ %endif %hpc_configure \ %define hpc_exec_prefix %{expand:%_hpc_exec_prefix} -%endif +%endif # ?hpc --disable-dependency-tracking \ --enable-fortran \ --enable-unsupported \ @@ -545,11 +540,10 @@ --enable-build-mode=production \ %if %{with mpi} --enable-parallel \ -%else +%endif --enable-cxx \ - %if 0%{?use_sz2} +%if 0%{?use_sz2} --with-szlib \ - %endif %endif --with-pthread @@ -597,10 +591,8 @@ %{hpc_write_pkgconfig -n hdf5_hl -l libhdf5_hl} %{hpc_write_pkgconfig -n hdf5_fortran -l libhdf5_fortran} %{hpc_write_pkgconfig -n hdf5_hl_fortran -l libhdfhl_fortran} -%if %{without mpi} %{hpc_write_pkgconfig -n hdf5_cpp -l libhdf5_cpp} %{hpc_write_pkgconfig -n hdf5_hl_cpp -l libhdf5_hl_cpp} -%endif %hpc_write_modules_files #%%Module1.0##################################################################### @@ -662,13 +654,10 @@ %endif %endif -%if %{without mpi} %post -n %{libname -l _cpp -s %{sonum_CXX}} -p /sbin/ldconfig %postun -n %{libname -l _cpp -s %{sonum_CXX}} -p /sbin/ldconfig %post -n %{libname -l _hl_cpp -s %{sonum_HL_CXX}} -p /sbin/ldconfig %postun -n %{libname -l _hl_cpp -s %{sonum_HL_CXX}} -p /sbin/ldconfig -%endif - %post -n %{libname -s %{sonum}} -p /sbin/ldconfig %postun -n %{libname -s %{sonum}} -p /sbin/ldconfig %post -n %{libname -l _hl -s %{sonum_HL}} -p /sbin/ldconfig @@ -700,7 +689,7 @@ %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/rpm/macros.hdf5 %endif -%endif +%endif # ?mpi %files -n %{name} %defattr(-,root,root) @@ -751,7 +740,6 @@ %{my_libdir}/libhdf5_hl.so.%{sonum_HL} %{my_libdir}/libhdf5_hl.so.%{sonum_HL}.* -%if %{without mpi} %files -n %{libname -l _cpp -s %{sonum_CXX}} %defattr(-,root,root) %mylicense COPYING @@ -767,7 +755,6 @@ %{?with_hpc:%hpc_dirs} %{my_libdir}/libhdf5_hl_cpp.so.%{sonum_HL_CXX} %{my_libdir}/libhdf5_hl_cpp.so.%{sonum_HL_CXX}.* -%endif # flavor == serial %files -n %{libname -l _fortran -s %{sonum_F}} %defattr(-,root,root) @@ -802,10 +789,10 @@ %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl}} %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_fortran}} %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl_fortran}} -%if %{without mpi} %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_cpp}} %{?with_hpc:%{hpc_pkgconfig_file -N -n hdf5_hl_cpp}} %{my_bindir}/h5c++ +%if %{without mpi} %{my_bindir}/h5cc %{my_bindir}/h5fc %else
