From e366075151d801fe472a69c43a1d14a7d43f7f4c Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Fri, 17 Feb 2012 13:37:42 +0000
Subject: [PATCH] Minor updates to the Open MPI spec file

This commit was SVN r25950.
---
 contrib/dist/linux/openmpi.spec | 38 ++++++++++++---------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

diff --git a/contrib/dist/linux/openmpi.spec b/contrib/dist/linux/openmpi.spec
index ab3b3f0c05..99f5ac69dd 100644
--- a/contrib/dist/linux/openmpi.spec
+++ b/contrib/dist/linux/openmpi.spec
@@ -9,7 +9,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2006-2009 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -46,10 +46,6 @@
 #
 #############################################################################
 
-# Help for OSCAR RPMs
-
-%{!?oscar: %define oscar 0}
-
 # Help for OFED RPMs
 
 %{!?ofed: %define ofed 0}
@@ -72,7 +68,7 @@
 # type: bool (0/1)
 %{!?install_modulefile: %define install_modulefile 0}
 # type: string (root path to install modulefiles)
-%{!?modulefile_path: %define modulefile_path /etc/modulefiles}
+%{!?modulefile_path: %define modulefile_path /usr/share/Modules/modulefiles}
 # type: string (subdir to install modulefile)
 %{!?modulefile_subdir: %define modulefile_subdir %{name}}
 # type: string (name of modulefile)
@@ -80,7 +76,7 @@
 
 # The name of the modules RPM.  Can vary from system to system.
 # type: string (name of modules RPM)
-%{!?modules_rpm_name: %define modules_rpm_name modules}
+%{!?modules_rpm_name: %define modules_rpm_name environment-modules}
 
 # Should we use the mpi-selector functionality?
 # type: bool (0/1)
@@ -147,22 +143,6 @@
 # type: bool (0/1)
 %{!?allow_fortify_source: %define allow_fortify_source 1}
 
-#############################################################################
-#
-# OSCAR-specific defaults
-#
-#############################################################################
-
-%if %{oscar}
-%define install_in_opt 1
-%define install_modulefile 1
-%define modulefile_path /opt/modules/modulefiles
-%define modulefile_subdir openmpi
-%define modulefile_name %{name}-%{version}
-%define modules_rpm_name modules-oscar
-%endif
-
-
 #############################################################################
 #
 # OFED-specific defaults
@@ -233,6 +213,10 @@
 %define optflags ""
 %endif
 
+%if %{use_mpi_selector}
+%define install_shell_scripts 1
+%endif
+
 #############################################################################
 #
 # Preamble Section
@@ -479,7 +463,7 @@ proc ModulesHelp { } {
    puts stderr "This module adds Open MPI v%{version} to various paths"
 }
 
-module-whatis   "Sets up Open MPI v%{version}  in your enviornment"
+module-whatis   "Sets up Open MPI v%{version} in your enviornment"
 
 prepend-path PATH "%{_prefix}/bin/"
 prepend-path LD_LIBRARY_PATH %{_libdir}
@@ -740,6 +724,12 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 #
 #############################################################################
 %changelog
+* Fri Feb 17 2012 Jeff Squyres <jsquyres@cisco.com>
+- Removed OSCAR define; that project is long gone.
+- If use_mpi_selector==1, then also set install_shell_scripts to 1.
+- Change modules default RPM name and modulefiles path to the defaults
+  on RHEL6.
+
 * Mon Dec 14 2009 Jeff Squyres <jsquyres@cisco.com>
 - Add missing executables to specfile (ompi-server, etc.)
 - Fix: pull in VT files when building multiple RPMs (reported by Jim