Hello community, here is the log from the commit of package mpitests for openSUSE:Factory checked in at 2020-01-25 13:23:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mpitests (Old) and /work/SRC/openSUSE:Factory/.mpitests.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mpitests" Sat Jan 25 13:23:22 2020 rev:7 rq:766916 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mpitests/mpitests.changes 2019-10-17 12:21:38.355270138 +0200 +++ /work/SRC/openSUSE:Factory/.mpitests.new.26092/mpitests.changes 2020-01-25 13:23:59.204031997 +0100 @@ -1,0 +2,12 @@ +Fri Jan 24 10:27:20 UTC 2020 - Stefan Brüns <[email protected]> + +- Fix syntax error in SLE version checks for openmpi3, sle_version + is not defined for Factory. + +------------------------------------------------------------------- +Mon Jan 6 16:12:10 UTC 2020 - Nicolas Morey-Chaisemartin <[email protected]> + +- Enable mpitests-openmpi3 for SLE >= 15-SP2 +- Support releases with openmpi not yet renamed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpitests.spec ++++++ --- /var/tmp/diff_new_pack.ck9ESg/_old 2020-01-25 13:24:00.356032502 +0100 +++ /var/tmp/diff_new_pack.ck9ESg/_new 2020-01-25 13:24:00.360032503 +0100 @@ -1,7 +1,7 @@ # # spec file for package mpitests # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -56,7 +56,7 @@ %endif Version: 3.2 Release: 0 -Url: http://www.openfabrics.org/downloads.htm +URL: http://www.openfabrics.org/downloads.htm Source0: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-%{osu_ver}.tar.gz Source1: https://github.com/intel/mpi-benchmarks/archive/v%{imb_ver}.tar.gz#/IMB_2018_Update1.tgz Source3: mpitests-runtests.sh @@ -78,6 +78,21 @@ Requires: mpitests = %{version} %endif +# openmpi was renamed to openmpi1 in Factory so only enable openmpi1 there +# and openmpi everywhere else +%if "%{flavor}" == "openmpi" +%if 0%{?suse_version} > 1500 +# Disable for Factory +ExclusiveArch: do_not_build +%endif +%endif +%if "%{flavor}" == "openmpi1" +%if 0%{?suse_version} <= 1500 +# Disable for everything but Factory +ExclusiveArch: do_not_build +%endif +%endif + %if "%{flavor}" == "mvapich2" ExcludeArch: %{arm} %endif @@ -133,14 +148,16 @@ %endif %if "%{flavor}" == "openmpi3" || "%{flavor}" == "openmpi3-gnu-hpc" -%if !0%{?is_opensuse} -#OpenMPI3 is not available in SLE, so do not build these flavors unless +%if 0%{!?is_opensuse} && 0%{?sle_version} < 150200 +#OpenMPI3 is not available in SLE < 15-SP2, so do not build these flavors unless #with openmpi3 is set %bcond_with mpitests_openmpi3 +%else +%bcond_without mpitests_openmpi3 +%endif %if %{without mpitests_openmpi3} ExclusiveArch: do_not_build %endif -%endif ExcludeArch: ppc64 %endif ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.ck9ESg/_old 2020-01-25 13:24:00.384032514 +0100 +++ /var/tmp/diff_new_pack.ck9ESg/_new 2020-01-25 13:24:00.384032514 +0100 @@ -1,5 +1,6 @@ <multibuild> <package>openmpi1-gnu-hpc</package> + <package>openmpi</package> <package>openmpi1</package> <package>openmpi2-gnu-hpc</package> <package>openmpi2</package>
