From 3591558d83d77edfabbedfc4236870c473f31d9e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2015 16:02:24 +0000
Subject: import mpitests-3.2-14.el7


---

diff --git a/SPECS/mpitests.spec b/SPECS/mpitests.spec
index cf433be..49dbe79 100644
--- a/SPECS/mpitests.spec
+++ b/SPECS/mpitests.spec
@@ -1,7 +1,7 @@
 Summary: MPI Benchmarks and tests
 Name: mpitests
 Version: 3.2
-Release: 12%{?dist}
+Release: 14%{?dist}
 License: BSD
 Group: Applications/Engineering
 # We get the mpitests.tar.gz file from an OFED release.
@@ -14,8 +14,6 @@ Patch0: mpitests-3.2-make.patch
 Patch1: mpitests-win-free.patch
 Provides: mpitests
 BuildRequires: hwloc-devel, libibmad-devel
-# mvapich2 only exists on these arches
-ExclusiveArch: i686 i386 x86_64 ia64 ppc64le
 
 %description
 Set of popular MPI benchmarks:
@@ -26,7 +24,7 @@ OSU benchmarks ver 3.1.1
 %package openmpi
 Summary: MPI tests package compiled against openmpi
 Group: Applications
-BuildRequires: openmpi >= 1.4, openmpi-devel
+BuildRequires: openmpi-devel >= 1.4
 %description openmpi
 MPI test suite compiled against the openmpi package
 
@@ -38,6 +36,8 @@ BuildRequires: librdmacm-devel, libibumad-devel
 %description mpich
 MPI test suite compiled against the mpich package
 
+# mvapich2 is not yet built on s390(x)
+%ifnarch s390 s390x
 %package mvapich2
 Summary: MPI tests package compiled against mvapich2
 Group: Applications
@@ -46,6 +46,16 @@ BuildRequires: librdmacm-devel, libibumad-devel
 %description mvapich2
 MPI test suite compiled against the mvapich2 package
 
+# s390(x) did not have openmpi-1.6
+%package compat-openmpi16
+Summary: MPI tests package compiled against compat-openmpi16
+Group: Applications
+BuildRequires: compat-openmpi16-devel
+%description compat-openmpi16
+MPI test suite compiled against the compat-openmpi16 package
+%endif
+
+# PSM is x86_64-only
 %ifarch x86_64
 %package mvapich2-psm
 Summary: MPI tests package compiled against mvapich2 using InfiniPath
@@ -79,7 +89,6 @@ do_build() {
   cd ..
 }
 
-
 # do N builds, one for each mpi stack
 %{_openmpi_load}
 do_build all
@@ -89,17 +98,23 @@ do_build all
 do_build all
 %{_mpich_unload}
 
+%ifnarch s390 s390x
 %{_mvapich2_load}
 do_build all
 %{_mvapich2_unload}
-%ifarch x86_64
 
+%{_compat_openmpi16_load}
+do_build all
+%{_compat_openmpi16_unload}
+%endif
+
+%ifarch x86_64
 %{_mvapich2_psm_load}
 do_build all
 %{_mvapich2_psm_unload}
 %endif
+
 %install
-rm -rf %{buildroot}
 # do N installs, one for each mpi stack
 %{_openmpi_load}
 mkdir -p %{buildroot}$MPI_BIN
@@ -111,37 +126,53 @@ mkdir -p %{buildroot}$MPI_BIN
 make -C .$MPI_COMPILER DESTDIR=%{buildroot} INSTALL_DIR=$MPI_BIN install
 %{_mpich_unload}
 
+%ifnarch s390 s390x
 %{_mvapich2_load}
 mkdir -p %{buildroot}$MPI_BIN
 make -C .$MPI_COMPILER DESTDIR=%{buildroot} INSTALL_DIR=$MPI_BIN install
 %{_mvapich2_unload}
+
+%{_compat_openmpi16_load}
+mkdir -p %{buildroot}$MPI_BIN
+make -C .$MPI_COMPILER DESTDIR=%{buildroot} INSTALL_DIR=$MPI_BIN install
+%{_compat_openmpi16_unload}
+%endif
+
 %ifarch x86_64
 %{_mvapich2_psm_load}
 mkdir -p %{buildroot}$MPI_BIN
 make -C .$MPI_COMPILER DESTDIR=%{buildroot} INSTALL_DIR=$MPI_BIN install
 %{_mvapich2_psm_unload}
 %endif
-%clean
-rm -rf %{buildroot}
 
 %files openmpi
-%defattr(-, root, root, -)
 %{_libdir}/openmpi/bin/*
 
 %files mpich
-%defattr(-, root, root, -)
 %{_libdir}/mpich/bin/*
 
+%ifnarch s390 s390x
 %files mvapich2
-%defattr(-, root, root, -)
 %{_libdir}/mvapich2/bin/*
 
+%files compat-openmpi16
+%{_libdir}/compat-openmpi16/bin/*
+%endif
+
 %ifarch x86_64
 %files mvapich2-psm
-%defattr(-, root, root, -)
 %{_libdir}/mvapich2-psm/bin/*
 %endif
+
 %changelog
+* Mon Sep 07 2015 Michal Schmidt <mschmidt@redhat.com> - 3.2-14
+- Rebuild for new openmpi. Add compat-openmpi16 subpackage.
+- Resolves: rhbz1258866
+
+* Thu Sep 11 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 3.2-13
+- Enable on aarch64
+  Resolves: rhbz1100503
+
 * Tue Sep 9 2014 Dan Horák <dhorak@redhat.com) - 3.2-12
 - enable on ppc64le
 - Resolves:#1125616