From 814852380711ea22480a7e4cbdd80026f63df1f9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Tue, 15 May 2012 16:24:18 -0600
Subject: [PATCH] Add patch from upstream to fix default hostfile location

---
 openmpi-hostfile.patch | 13 +++++++++++++
 openmpi.spec           |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 openmpi-hostfile.patch

diff --git a/openmpi-hostfile.patch b/openmpi-hostfile.patch
new file mode 100644
index 0000000..d5080a9
--- /dev/null
+++ b/openmpi-hostfile.patch
@@ -0,0 +1,13 @@
+Index: orte/runtime/orte_mca_params.c
+===================================================================
+--- orte/runtime/orte_mca_params.c	(revision 26440)
++++ orte/runtime/orte_mca_params.c	(working copy)
+@@ -303,7 +303,7 @@
+                                    false, false, NULL, &strval);
+     if (NULL == strval) {
+         /* nothing was given, so define the default */
+-        asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
++        asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
+         /* flag that nothing was given */
+         orte_default_hostfile_given = false;
+     } else if (0 == strcmp(strval, "none")) {
diff --git a/openmpi.spec b/openmpi.spec
index d38fa93..b3ba906 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -19,7 +19,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.6
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD, MIT and Romio
@@ -35,6 +35,8 @@ Source1:		openmpi.module.in
 Source2:		macros.openmpi
 # Patch to handle removed items
 Patch0:			openmpi-removed.patch
+# Patch from upstream svn to fix default hostfile location
+Patch1:			openmpi-hostfile.patch
 
 BuildRequires:		gcc-gfortran, libtool
 # ARM HW doesn't support NUMA
@@ -115,6 +117,7 @@ Contains development headers and libraries for openmpi
 %prep
 %setup -q -n openmpi-%{version}
 %patch0 -p1 -b .removed
+%patch1 -p0 -b .hostfile
 # Make sure we don't use the local libltdl library
 rm -r opal/libltdl
 
@@ -236,6 +239,9 @@ sed -i -e s/-ldl// -e s/-lhwloc// \
 %{_sysconfdir}/rpm/macros.%{namearch}
 
 %changelog
+* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> 1.6.0-2
+- Add patch from upstream to fix default hostfile location
+
 * Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> 1.6.0-1
 - Update to 1.6.0
 - Drop arm patch, appears to be addressed upstream