.mpitests.metadata

@@ -0,0 +1,2 @@
+54718f6312d64e6500605aadccbbd5461e5ae818 SOURCES/IMB-v2021.3.tar.gz
+8c9a1e9761af580b3bcfc6f60c73d7c697c62807 SOURCES/osu-micro-benchmarks-7.1-1.tar.gz

SOURCES/0001-Avoid-build-failure-for-i686.patch

@@ -1,7 +1,7 @@
-From eeccd454f9dc8b528be706b887f246e82a19d127 Mon Sep 17 00:00:00 2001
+From 37a4deab051d89b95159c4a3559dd084ec7df1c4 Mon Sep 17 00:00:00 2001
 From: Kamal Heib <kheib@redhat.com>
 Date: Mon, 10 Jul 2023 13:15:27 -0400
-Subject: [PATCH] Avoid build failure for i386
+Subject: [PATCH] Avoid build failure for i686
 
 Signed-off-by: Kamal Heib <kheib@redhat.com>
 ---
@@ -9,14 +9,14 @@ Signed-off-by: Kamal Heib <kheib@redhat.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/c/util/osu_util_validation.c b/c/util/osu_util_validation.c
-index c2cd1fa14c1c..b0e1641b1863 100644
+index c2cd1fa14c1c..f04ed3c1d958 100644
 --- a/c/util/osu_util_validation.c
 +++ b/c/util/osu_util_validation.c
 @@ -299,8 +299,10 @@ static int atom_binary_compare(MPI_Datatype dtype, void *a, void *b)
              return COMPARE_AS_TYPE(__int32_t, a, b);
          case 8:
              return COMPARE_AS_TYPE(__int64_t, a, b);
-+#ifndef __i386__
++#ifndef __i686__
          case 16:
              return COMPARE_AS_TYPE(__int128_t, a, b);
 +#endif

SPECS/mpitests.spec

@@ -3,7 +3,7 @@
 Summary: MPI Benchmarks and tests
 Name: mpitests
 Version: 7.1
-Release: 2%{?dist}.1
+Release: 2%{?dist}
 License: CPL and BSD
 Group: Applications/Engineering
 # These days we get the benchmark soucres from Intel and OSU directly
@@ -14,7 +14,7 @@ Source0: https://github.com/intel/mpi-benchmarks/archive/%{intel_mpi_bench_vers}
 Source1: http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-%{osu_micro_bench_vers}.tar.gz
 # Only for old openmpi
 #Patch101: OMB-disable-collective-async.patch
-Patch0001: 0001-Avoid-build-failure-for-i386.patch
+Patch0001: 0001-Avoid-build-failure-for-i686.patch
 BuildRequires: hwloc-devel, libibmad-devel, rdma-core-devel
 BuildRequires: automake, autoconf, libtool
 BuildRequires: gcc, gcc-c++
@@ -174,54 +174,32 @@ do_install
 %endif
 
 %changelog
-* Tue Jul 11 2023 Kamal Heib <kheib@redhat.com> - 7.1-2.1
-- Avoid build failure for i386 arch
-- Resolves: rhbz#2220949
-
 * Tue Jul 11 2023 Kamal Heib <kheib@redhat.com> - 7.1-2
-- Avoid build failure for i686
-- Resolves: rhbz#2220949
+- Avoid build failure for i636
+- Resolves: rhbz#2220941
 
 * Thu Jul 06 2023 Kamal Heib <kheib@redhat.com> - 7.1-1
-- Update OSU benchmarks ito upstream release 7.1
-- Add gating tests.
-- Resolves: rhbz#2220949
+- Update OSU benchmarks to upstream release 7.1
+- Resolves: rhbz#2220941
 
-* Fri Dec 10 2021 Honggang Li <honli@redhat.com> - 5.8-1
+* Wed Dec 08 2021 Honggang Li <honli@redhat.com> - 5.8-1
 - Update OSU benchmarks to upstream release 5.8
 - Update Intel MPI Benchmarks 2021.3
-- Resolves: rhbz#2008517
+- Resolves: rhbz#2015392
 
-* Thu May 13 2021 Honggang Li <honli@redhat.com> - 5.7-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.7-4
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Tue Jul 20 2021 Honggang Li <honli@redhat.com> - 5.7-3
 - Update OSU benchmarks to upstream release 5.7.1
 - Update Intel MPI Benchmarks 2021.2
-- Resolves: rhbz#1960078
+- Resolves: rhbz#1960479
 
-* Tue Dec 22 2020 Honggang Li <honli@redhat.com> - 5.7-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.7-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Thu Feb 18 2021 Honggang Li <honli@redhat.com> - 5.7-1
 - Update OSU benchmarks to upstream release 5.7
-- Resolves: rhbz#1909632
-
-* Thu Oct 15 2020 Honggang Li <honli@redhat.com> - 5.6.3-1
-- Update OSU benchmarks to upstream release 5.6.3
-- Resolves: rhbz#1888568
-
-* Tue May 12 2020 Honggang Li <honli@redhat.com> - 5.6.2-1
-- Update OSU benchmarks to upstream release 5.6.2
-- Update IMB benchmarks to upstream release v2019.6
-- Resolves: rhbz#1817837
-
-* Sat Sep 22 2018 Jarod Wilson <jarod@redhat.com> - 5.4.2-4
-- Properly fix build and linker flags, annocheck now silent
-- Resolves: rhbz#1624145
-
-* Tue Sep 18 2018 Jarod Wilson <jarod@redhat.com> - 5.4.2-3
-- First wave of compiler flag usage fixups from annobin scans
-- Related: rhbz#1624145
-
-* Thu Sep 13 2018 Jarod Wilson <jarod@redhat.com> - 5.4.2-2
-- Rebuild with updated openmpi, mvapich and mpich for proper deps
-- Resolves: rhbz#1628627
-
-* Thu Aug 16 2018 Jarod Wilson <jarod@redhat.com> - 5.4.2-1
-- Initial build for RHEL8, based on latest RHEL7 package
-- Resolves: rhbz#1556959
+- Build mpitests for RHEL9
+- Resolves: rhbz#1923508