From 6cb7033e84fb9040af7784b5359dacc6bf4c630e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2020 11:46:39 +0000
Subject: import openmpi-4.0.3-3.el8


---

diff --git a/.gitignore b/.gitignore
index 0059afc..a3bd7c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/openmpi-4.0.2.tar.bz2
+SOURCES/openmpi-4.0.3.tar.bz2
diff --git a/.openmpi.metadata b/.openmpi.metadata
index 4f22582..82706ff 100644
--- a/.openmpi.metadata
+++ b/.openmpi.metadata
@@ -1 +1 @@
-32ce3761288575fb8e4f6296c9105c3a25cf3235 SOURCES/openmpi-4.0.2.tar.bz2
+d958454e32da2c86dd32b7d557cf9a401f0a08d3 SOURCES/openmpi-4.0.3.tar.bz2
diff --git a/SOURCES/openmpi.module.in b/SOURCES/openmpi.module.in
index 6885013..287a4b5 100644
--- a/SOURCES/openmpi.module.in
+++ b/SOURCES/openmpi.module.in
@@ -6,7 +6,7 @@ conflict		mpi
 prepend-path 		PATH 		@LIBDIR@/bin
 prepend-path 		LD_LIBRARY_PATH @LIBDIR@/lib
 prepend-path 		PKG_CONFIG_PATH	@LIBDIR@/lib/pkgconfig
-prepend-path		MANPATH		@MANDIR@
+prepend-path		MANPATH		:@MANDIR@
 setenv 			MPI_BIN		@LIBDIR@/bin
 setenv			MPI_SYSCONFIG	@ETCDIR@
 setenv			MPI_FORTRAN_MOD_DIR	@FMODDIR@
diff --git a/SPECS/openmpi.spec b/SPECS/openmpi.spec
index 249e647..ea50cdc 100644
--- a/SPECS/openmpi.spec
+++ b/SPECS/openmpi.spec
@@ -21,8 +21,8 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:			openmpi%{?_cc_name_suffix}
-Version:		4.0.2
-Release:		2%{?dist}
+Version:		4.0.3
+Release:		3%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD and MIT and Romio
@@ -38,7 +38,7 @@ BuildRequires:		gcc-gfortran, gcc-c++
 %ifnarch s390 s390x
 BuildRequires:		valgrind-devel
 %endif
-%ifnarch s390 s390x i686 %{arm}
+%ifnarch s390 s390x i686
 BuildRequires:		ucx-devel
 %endif
 %ifnarch s390 s390x %{arm}
@@ -154,7 +154,7 @@ OpenMPI support for Python 3.
 	--with-valgrind \
 	--enable-memchecker \
 %endif
-%ifnarch s390 s390x i686 %{arm}
+%ifnarch s390 s390x i686
 	--with-ucx \
 	--with-ucx-libdir=%{_libdir} \
 %endif
@@ -235,7 +235,7 @@ make check
 %{_libdir}/%{name}/bin/mpi[er]*
 %{_libdir}/%{name}/bin/ompi*
 %{_libdir}/%{name}/bin/orte[-dr_]*
-%ifnarch s390 s390x i686 %{arm}
+%ifnarch s390 s390x i686
 %{_libdir}/%{name}/bin/osh*
 %{_libdir}/%{name}/bin/shmem*
 %endif
@@ -287,6 +287,14 @@ make check
 
 
 %changelog
+* Tue Jul 28 2020 Honggang Li <honli@redhat.com> - 4.0.3-3
+- Fix module load overwrites system MANPATH
+- Resolves: rhbz#1858519
+
+* Tue May 12 2020 Honggang Li <honli@redhat.com> - 4.0.3-1
+- Update to upstream v4.0.3 release
+- Resolves: rhbz#1817834
+
 * Sun Jan 19 2020 Honggang Li <honli@redhat.com> - 4.0.2-2
 - Rebuild against ucx-1.6
 - Resolves: rhbz#1791483