Update to 1.10.1

.gitignore

@@ -29,3 +29,4 @@ openmpi-1.4.1-RH.tar.bz2
 /openmpi-1.8.7.tar.bz2
 /openmpi-1.8.8.tar.bz2
 /openmpi-1.10.0.tar.bz2
+/openmpi-1.10.1.tar.bz2

openmpi-opal.patch

@@ -1,33 +0,0 @@
-diff -up openmpi-1.10.0/ompi/mca/mtl/ofi/mtl_ofi_component.c.opal openmpi-1.10.0/ompi/mca/mtl/ofi/mtl_ofi_component.c
---- openmpi-1.10.0/ompi/mca/mtl/ofi/mtl_ofi_component.c.opal	2015-08-22 13:19:46.000000000 -0600
-+++ openmpi-1.10.0/ompi/mca/mtl/ofi/mtl_ofi_component.c	2015-09-16 13:20:27.749403522 -0600
-@@ -13,6 +13,7 @@
-  */
- 
- #include "mtl_ofi.h"
-+#include "opal/util/argv.h"
- 
- static int ompi_mtl_ofi_component_open(void);
- static int ompi_mtl_ofi_component_query(mca_base_module_t **module, int *priority);
-diff -up openmpi-1.10.0/ompi/tools/ompi_info/ompi_info.c.opal openmpi-1.10.0/ompi/tools/ompi_info/ompi_info.c
---- openmpi-1.10.0/ompi/tools/ompi_info/ompi_info.c.opal	2015-07-16 09:10:59.000000000 -0600
-+++ openmpi-1.10.0/ompi/tools/ompi_info/ompi_info.c	2015-09-16 13:24:34.460318311 -0600
-@@ -50,6 +50,7 @@
- #endif
- #include "opal/mca/base/base.h"
- #include "opal/runtime/opal_info_support.h"
-+#include "opal/util/argv.h"
- #include "opal/util/show_help.h"
- 
- #if OMPI_RTE_ORTE
-diff -up openmpi-1.10.0/orte/mca/plm/base/plm_base_receive.c.opal openmpi-1.10.0/orte/mca/plm/base/plm_base_receive.c
---- openmpi-1.10.0/orte/mca/plm/base/plm_base_receive.c.opal	2015-07-16 09:10:59.000000000 -0600
-+++ openmpi-1.10.0/orte/mca/plm/base/plm_base_receive.c	2015-09-16 13:25:43.628016451 -0600
-@@ -37,6 +37,7 @@
- #include "opal/mca/mca.h"
- #include "opal/dss/dss.h"
- #include "opal/threads/threads.h"
-+#include "opal/util/argv.h"
- 
- #include "orte/constants.h"
- #include "orte/types.h"

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:		1.10.0
+Version:		1.10.1
-Release:		3%{?dist}
+Release:		1%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD, MIT and Romio
@@ -35,10 +35,6 @@ Source2:		openmpi.pth.py2
 Source3:		openmpi.pth.py3
 Source4:		macros.openmpi
 
-# Add needed opal/util/argv.h include
-# https://github.com/open-mpi/ompi-release/pull/584
-Patch0:			openmpi-opal.patch
-
 BuildRequires:		gcc-gfortran
 %ifnarch s390
 BuildRequires:		valgrind-devel
@@ -128,7 +124,6 @@ Contains development wrapper for compiling Java with openmpi.
 
 %prep
 %setup -q -n openmpi-%{version}
-%patch0 -p1 -b .opal
 
 %build
 ./configure --prefix=%{_libdir}/%{name} \
@@ -223,6 +218,8 @@ make check
 %{_mandir}/%{namearch}/man1/ompi*
 %{_mandir}/%{namearch}/man1/orte[-dr_]*
 %{_mandir}/%{namearch}/man1/oshmem_info*
+%{_mandir}/%{namearch}/man1/oshrun*
+%{_mandir}/%{namearch}/man1/shmemrun*
 %{_mandir}/%{namearch}/man7/ompi*
 %{_mandir}/%{namearch}/man7/orte*
 %{_libdir}/%{name}/lib/openmpi/*
@@ -250,6 +247,8 @@ make check
 %{_libdir}/%{name}/lib/*.mod
 %{_libdir}/%{name}/lib/pkgconfig/
 %{_mandir}/%{namearch}/man1/mpi[cCf]*
+%{_mandir}/%{namearch}/man1/osh[cCf]*
+%{_mandir}/%{namearch}/man1/shmem[cCf]*
 %{_mandir}/%{namearch}/man1/opal_*
 %{_mandir}/%{namearch}/man3/*
 %{_mandir}/%{namearch}/man7/opal*
@@ -270,6 +269,9 @@ make check
 
 
 %changelog
+* Thu Nov 5 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.1-1
+- Update to 1.10.1
+
 * Tue Oct 6 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-3
 - Do not set CFLAGS in %%_openmpi_load
 

sources

@@ -1 +1 @@
-280cf952de68369cebaca886c5ce0304  openmpi-1.10.0.tar.bz2
+f0fcd77ed345b7eafb431968124ba16e  openmpi-1.10.1.tar.bz2