From 78ddcff82b10fd80eafb7b2dc5e4ce2bb9ecbe3c Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Sun, 20 Mar 2016 21:55:19 -0600
Subject: [PATCH] Add patch to properly call MPI_Finalize() in t_pflush1

---
 hdf5-mpi.patch | 29 +++++++++++++++++++++++++++++
 hdf5.spec      |  8 +++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 hdf5-mpi.patch

diff --git a/hdf5-mpi.patch b/hdf5-mpi.patch
new file mode 100644
index 0000000..e2e9386
--- /dev/null
+++ b/hdf5-mpi.patch
@@ -0,0 +1,29 @@
+diff -up hdf5-1.8.16/testpar/t_pflush1.c.mpi hdf5-1.8.16/testpar/t_pflush1.c
+--- hdf5-1.8.16/testpar/t_pflush1.c.mpi	2015-10-23 23:13:44.000000000 -0600
++++ hdf5-1.8.16/testpar/t_pflush1.c	2016-03-20 21:46:42.089409776 -0600
+@@ -171,6 +171,7 @@ main(int argc, char* argv[])
+      * because MPI_File_close wants to modify the file-handle variable.
+      */
+ 
++#if 0
+     /* close file1 */
+     if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0) {
+ 	printf("H5Fget_vfd_handle for file1 failed\n");
+@@ -189,14 +190,17 @@ main(int argc, char* argv[])
+ 	printf("MPI_File_close for file2 failed\n");
+ 	goto error;
+     } /* end if */
++#endif
+ 
+     fflush(stdout);
+     fflush(stderr);
++    MPI_Finalize();
+     HD_exit(0);
+ 
+ error:
+     fflush(stdout);
+     fflush(stderr);
++    MPI_Finalize();
+     HD_exit(1);
+ }
+ 
diff --git a/hdf5.spec b/hdf5.spec
index b50681d..109b7a5 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -7,7 +7,7 @@
 # You need to recompile all users of HDF5 for each version change
 Name: hdf5
 Version: 1.8.16
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
@@ -18,6 +18,8 @@ Source1: h5comp
 # For man pages
 Source2: http://ftp.us.debian.org/debian/pool/main/h/hdf5/hdf5_1.8.15-patch1+docs-5.debian.tar.xz
 Patch0: hdf5-LD_LIBRARY_PATH.patch
+# Properly run MPI_Finalize() in t_pflush1
+Patch1: hdf5-mpi.patch
 # Fix -Werror=format-security errors
 Patch2: hdf5-format.patch
 # Fix long double conversions on ppc64le
@@ -149,6 +151,7 @@ HDF5 parallel openmpi static libraries
 %prep
 %setup -q -a 2 -n %{name}-%{version}%{?snaprel}
 %patch0 -p1 -b .LD_LIBRARY_PATH
+%patch1 -p1 -b .mpi
 %patch2 -p1 -b .format
 %patch3 -p1 -b .ldouble-ppc64le
 # Force shared by default for compiler wrappers (bug #1266645)
@@ -419,6 +422,9 @@ done
 
 
 %changelog
+* Sun Mar 20 2016 Orion Poplawski <orion@cora.nwra.com> - 1.8.16-4
+- Add patch to properly call MPI_Finalize() in t_pflush1
+
 * Wed Mar 2 2016 Orion Poplawski <orion@cora.nwra.com> - 1.8.16-3
 - Make hdf5-mpich-devel require mpich-devel (bug #1314091)