From b657ab44d63c0148aa32aa4d0f275c1593202943 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Tue, 15 May 2012 16:36:19 -0600
Subject: [PATCH] Rebase hostfile patch for 1.6

---
 openmpi-hostfile.patch | 25 ++++++++++++-------------
 openmpi.spec           |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/openmpi-hostfile.patch b/openmpi-hostfile.patch
index d5080a9..f637767 100644
--- a/openmpi-hostfile.patch
+++ b/openmpi-hostfile.patch
@@ -1,13 +1,12 @@
-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 -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c
+--- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile	2012-04-24 13:18:21.000000000 -0600
++++ openmpi-1.6/orte/runtime/orte_mca_params.c	2012-05-15 16:35:24.769565442 -0600
+@@ -225,7 +225,7 @@ int orte_register_params(void)
+                                 false, false, 1000, &orte_timeout_usec_per_proc);
+     
+     /* default hostfile */
+-    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);
+     mca_base_param_reg_string_name("orte", "default_hostfile",
+                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
+                                    false, false, orte_default_hostfile, &orte_default_hostfile);
diff --git a/openmpi.spec b/openmpi.spec
index b3ba906..922989d 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -117,7 +117,7 @@ Contains development headers and libraries for openmpi
 %prep
 %setup -q -n openmpi-%{version}
 %patch0 -p1 -b .removed
-%patch1 -p0 -b .hostfile
+%patch1 -p1 -b .hostfile
 # Make sure we don't use the local libltdl library
 rm -r opal/libltdl