Hello community, here is the log from the commit of package hdf5 for openSUSE:Factory checked in at 2019-04-04 12:06:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdf5 (Old) and /work/SRC/openSUSE:Factory/.hdf5.new.3908 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdf5" Thu Apr 4 12:06:46 2019 rev:55 rq:690889 version:1.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/hdf5/hdf5.changes 2019-02-01 11:46:08.068510024 +0100 +++ /work/SRC/openSUSE:Factory/.hdf5.new.3908/hdf5.changes 2019-04-04 12:07:04.509456645 +0200 @@ -1,0 +2,27 @@ +Mon Apr 1 12:41:23 UTC 2019 - [email protected] + +- Add _constraints to avoid transient build error ppc64le + +------------------------------------------------------------------- +Sat Mar 9 15:04:06 UTC 2019 - Stefan Brüns <[email protected]> + +- Update URL: and Source: to use https://. + +------------------------------------------------------------------- +Fri Mar 1 12:19:33 UTC 2019 - Egbert Eich <[email protected]> + +- Like on PPC ignore transient 'make check' failures on aarch64. + +------------------------------------------------------------------- +Fri Mar 1 09:37:54 UTC 2019 - Egbert Eich <[email protected]> + +- Remove ringdisabled magic as hdf5 is no longer a ring package. + This should resolve a number of problems in the review channels + for Factory with packages requiring hdf5 libs. + +------------------------------------------------------------------- +Wed Feb 13 10:37:28 UTC 2019 - Egbert Eich <[email protected]> + +- Consolidate use of openmpi1, openmpi2, openmpi3 for non-HPC builds. + +------------------------------------------------------------------- New: ---- _constraints ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdf5.spec ++++++ --- /var/tmp/diff_new_pack.BJkwxT/_old 2019-04-04 12:07:06.209457095 +0200 +++ /var/tmp/diff_new_pack.BJkwxT/_new 2019-04-04 12:07:06.213457096 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -38,8 +38,6 @@ %define src_ver %{version} %define pname hdf5 -%bcond_with ringdisabled - %if "%{flavor}" == "" ExclusiveArch: do_not_build %define package_name %pname @@ -53,19 +51,22 @@ %if "%{flavor}" == "openmpi" %{?DisOMPI1} -%global mpi_flavor %{flavor} +%global mpi_flavor openmpi +%define mpi_vers 1 %bcond_with hpc %endif %if "%{flavor}" == "openmpi2" %{?DisOMPI2} -%global mpi_flavor %{flavor} +%global mpi_flavor openmpi +%define mpi_vers 2 %bcond_with hpc %endif %if "%{flavor}" == "openmpi3" %{?DisOMPI3} -%global mpi_flavor %{flavor} +%global mpi_flavor openmpi +%define mpi_vers 3 %bcond_with hpc %endif @@ -166,26 +167,21 @@ %endif # Disable until resource issue is resolved. -%if "%mpi_flavor" == "openmpi" +%if "%mpi_flavor" == "openmpi" && 0%{?mpi_vers} == 1 %define _do_check 0 %endif %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}} %{?with_hpc:%{!?compiler_family:%global compiler_family gnu}} -%{?with_mpi:%{!?mpi_flavor:%global mpi_flavor openmpi}} +%{?with_mpi:%{!?mpi_flavor:error "No MPI family specified!"}} -%{?with_mpi:%global my_suffix -%{mpi_flavor}} - -# Magic for OBS Staging. Only build the flavors required by -# other packages in the ring. -%if %{with ringdisabled} - %if %{with hpc} || "%{?mpi_flavor}" == "mvapich2" -ExclusiveArch: do_not_build - %endif +# For compatibility package names +%if "%{mpi_flavor}" != "openmpi" || "%{mpi_vers}" != "1" +%define mpi_ext %{?mpi_vers} %endif %if %{with hpc} -%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_ver:-V %{mpi_ver}} %{?ext:-e %{ext}}} +%{hpc_init -c %compiler_family %{?with_mpi:-m %mpi_flavor} %{?c_f_ver:-v %{c_f_ver}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}} %{?with_mpi:%global hpc_module_pname p%{pname}} %define my_prefix %hpc_prefix %define my_bindir %hpc_bindir @@ -201,7 +197,8 @@ %define my_libdir %_libdir %define my_incdir %_includedir %else - %define my_prefix %{_libdir}/mpi/gcc/%{mpi_flavor} + %define my_prefix %{_libdir}/mpi/gcc/%{mpi_flavor}%{?mpi_ext} + %define my_suffix -%{mpi_flavor}%{?mpi_ext} %define my_bindir %{my_prefix}/bin %define my_libdir %{my_prefix}/%{_lib}/ %define my_incdir %{my_prefix}/include/ @@ -228,8 +225,8 @@ Summary: Command-line programs for the HDF5 scientific data format License: BSD-3-Clause Group: Productivity/Scientific/Other -Url: http://www.hdfgroup.org/HDF5/ -Source0: http://www.hdfgroup.org/ftp/HDF5/releases/%{pname}-%{short_ver}/%{pname}-%{src_ver}/src/%{pname}-%{src_ver}.tar.bz2 +Url: https://www.hdfgroup.org/HDF5/ +Source0: https://www.hdfgroup.org/ftp/HDF5/releases/%{pname}-%{short_ver}/%{pname}-%{src_ver}/src/%{pname}-%{src_ver}.tar.bz2 Source100: _multibuild Source1000: update_so_version.sh Patch0: hdf5-LD_LIBRARY_PATH.patch @@ -252,7 +249,7 @@ BuildRequires: gcc-c++ BuildRequires: gcc-fortran %if %{with mpi} -BuildRequires: %{flavor}-devel +BuildRequires: %{mpi_flavor}%{?mpi_ext}-devel %else Requires: lib%{pname}_cpp%{sonum_CXX} = %{version} Requires: lib%{pname}_hl_cpp%{sonum_HL_CXX} = %{version} @@ -667,8 +664,8 @@ export HDF5_Make_Ignore=yes %endif %{?with_hpc:%hpc_setup} - %ifarch ppc ppc64 ppc64le - make %{?_smp_mflags} check || { echo "Ignore transient make check failures for PowerPC. boo#1058563"; } + %ifarch ppc ppc64 ppc64le aarch64 + make %{?_smp_mflags} check || { echo "Ignore transient make check failures for PowerPC or aarch64. boo#1058563"; } %else %if "%{?mpi_flavor}" != "mpich" || ("%_arch" != "s390" && "%_arch" != "s390x") make %{?_smp_mflags} check ++++++ _constraints ++++++ <constraints> <overwrite> <conditions> <arch>ppc64</arch> <arch>ppc64le</arch> </conditions> <hardware> <physicalmemory> <size unit="M">3000</size> </physicalmemory> <disk> <size unit="G">4</size> </disk> </hardware> </overwrite> </constraints>
