[Ray/f20] mpich package name is mpich2 in el6

[Sebastien Boisvert]

commit 5572cdbed8c66e24b37511f60cd2ba76fec4eb4c
Author: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>
Date:   Mon Feb 24 15:31:13 2014 -0500

    mpich package name is mpich2 in el6
    
    Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>

 Ray.spec |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)
---
diff --git a/Ray.spec b/Ray.spec
index 4fde096..c182c9c 100644
--- a/Ray.spec
+++ b/Ray.spec
@@ -1,6 +1,6 @@
 Name:           Ray
 Version:        2.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Parallel genome assemblies for parallel DNA sequencing
 
 Group:          Applications/Engineering
@@ -9,17 +9,24 @@ URL:            http://denovoassembler.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/denovoassembler/%{name}-%{version}.tar.bz2
 Patch0:         Ray.manpage.patch
 
-%global mpich 1
+%global useMpich 1
 %ifarch ppc64
 %if 0%{?rhel}==5 || 0%{?rhel} == 6
-%global mpich 0
+%global useMpich 0
 %endif
 %endif
 
+%define mpichName mpich
+
+# el6 still uses the old name MPICH2
+%if 0%{?rhel}==5 || 0%{?rhel} == 6
+	%define mpichName mpich2
+%endif
+
 BuildRequires:  openmpi-devel, bzip2-devel, zlib-devel
 
-%if %mpich
-BuildRequires:  mpich-devel
+%if %useMpich
+BuildRequires:  %{mpichName}-devel
 %endif
 
 %description
@@ -57,13 +64,13 @@ computers using the message-passing interface (MPI) standard.
 This sub-package enables parallel computation using openmpi.
 
 
-%if %mpich
-%package mpich
-Summary:        %{name} package for MPICH2
+%if %useMpich
+%package %{mpichName}
+Summary:        %{name} package for MPICH
 Group:          Applications/Engineering
-Requires:       mpich, %{name}-common
+Requires:       %{mpichName}, %{name}-common
 
-%description mpich
+%description %{mpichName}
 %{name} is a parallel software that computes de novo genome assemblies with   
 next-generation sequencing data.
 %{name} is written in C++ and can run in parallel on numerous interconnected 
@@ -113,7 +120,7 @@ cp %{name}Platform/AUTHORS AUTHORS.%{name}Platform
 make clean
 %{_openmpi_unload}
 
-%if %mpich
+%if %useMpich
 %{_mpich_load}
 make CXXFLAGS="$CXXFLAGS" HAVE_LIBBZ2=y HAVE_LIBZ=y
 cp %{name} %{name}$MPI_SUFFIX
@@ -134,7 +141,7 @@ mkdir -p %{buildroot}$MPI_BIN
 install -m 0755 %{name}$MPI_SUFFIX %{buildroot}$MPI_BIN
 %{_openmpi_unload}
 
-%if %mpich
+%if %useMpich
 # Ray-mpich
 %{_mpich_load}
 mkdir -p %{buildroot}$MPI_BIN
@@ -166,8 +173,8 @@ rm -rf %{buildroot}
 %files openmpi
 %{_libdir}/openmpi/bin/%{name}*
 
-%if %mpich
-%files mpich
+%if %useMpich
+%files %{mpichName}
 %{_libdir}/mpich/bin/%{name}*
 %endif
 
@@ -179,6 +186,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Mon Feb 24 2014 Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca> - 2.3.1-2
+- add a variable for mpich package name (mpich or mpich2)
+
 * Mon Feb 24 2014 Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca> - 2.3.1-1
 - Fix days of week in spec changelog (rpmlint warning)
 - Update version with upstream.