[Ray] use correct macro name to load/unload mpich2

Sebastien Boisvert sebhtml at fedoraproject.org
Sun Mar 2 14:08:28 UTC 2014


commit a3e78bcc896dbf38e6fb3b5637009745313c03a8
Author: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>
Date:   Sun Mar 2 09:07:57 2014 -0500

    use correct macro name to load/unload mpich2
    
    Reviewed-by: Susi Lehtola <jussilehtola at fedoraproject.org>
    Reviewed-by: Christopher Meng <cickumqt at gmail.com>
    Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>

 Ray.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Ray.spec b/Ray.spec
index c182c9c..7f44fd5 100644
--- a/Ray.spec
+++ b/Ray.spec
@@ -20,7 +20,7 @@ Patch0:         Ray.manpage.patch
 
 # el6 still uses the old name MPICH2
 %if 0%{?rhel}==5 || 0%{?rhel} == 6
-	%define mpichName mpich2
+    %define mpichName mpich2
 %endif
 
 BuildRequires:  openmpi-devel, bzip2-devel, zlib-devel
@@ -121,11 +121,11 @@ make clean
 %{_openmpi_unload}
 
 %if %useMpich
-%{_mpich_load}
+%{_%{mpichName}_load}
 make CXXFLAGS="$CXXFLAGS" HAVE_LIBBZ2=y HAVE_LIBZ=y
 cp %{name} %{name}$MPI_SUFFIX
 make clean
-%{_mpich_unload}
+%{_%{mpichName}_unload}
 %endif
 
 %install
@@ -143,10 +143,10 @@ install -m 0755 %{name}$MPI_SUFFIX %{buildroot}$MPI_BIN
 
 %if %useMpich
 # Ray-mpich
-%{_mpich_load}
+%{_%{mpichName}_load}
 mkdir -p %{buildroot}$MPI_BIN
 install -m 0755 %{name}$MPI_SUFFIX %{buildroot}$MPI_BIN
-%{_mpich_unload}
+%{_%{mpichName}_unload}
 %endif
 
 # Ray-doc


More information about the scm-commits mailing list