[Ray/f19: 4/4] changed the dependency from mpich2 to mpich

[Sebastien Boisvert]

commit 0209d47b11dd70b40c8ced1dec79a003011009ef
Author: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>
Date:   Wed Sep 4 10:24:40 2013 -0400

    changed the dependency from mpich2 to mpich
    
    Link: http://koji.fedoraproject.org/koji/taskinfo?taskID=5893793
    Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>

 Ray.spec |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/Ray.spec b/Ray.spec
index e1c223c..60c7ec0 100644
--- a/Ray.spec
+++ b/Ray.spec
@@ -9,17 +9,17 @@ URL:            http://denovoassembler.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/denovoassembler/%{name}-v%{version}.tar.bz2
 Patch0:         Ray.manpage.patch
 
-%global mpich2 1
+%global mpich 1
 %ifarch ppc64
 %if 0%{?rhel}==5 || 0%{?rhel} == 6
-%global mpich2 0
+%global mpich 0
 %endif
 %endif
 
 BuildRequires:  openmpi-devel, bzip2-devel, zlib-devel
 
-%if %mpich2
-BuildRequires:  mpich2-devel
+%if %mpich
+BuildRequires:  mpich-devel
 %endif
 
 %description
@@ -57,18 +57,18 @@ computers using the message-passing interface (MPI) standard.
 This sub-package enables parallel computation using openmpi.
 
 
-%if %mpich2
-%package mpich2
+%if %mpich
+%package mpich
 Summary:        %{name} package for MPICH2
 Group:          Applications/Engineering
-Requires:       mpich2, %{name}-common
+Requires:       mpich, %{name}-common
 
-%description mpich2
+%description mpich
 %{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 
 computers using the message-passing interface (MPI) standard.
-This sub-package enables parallel computation using mpich2.
+This sub-package enables parallel computation using mpich.
 %endif
 
 %package doc
@@ -115,12 +115,12 @@ cp %{name}Platform/AUTHORS AUTHORS.%{name}Platform
 make clean
 %{_openmpi_unload}
 
-%if %mpich2
-%{_mpich2_load}
+%if %mpich
+%{_mpich_load}
 make CXXFLAGS="$CXXFLAGS" HAVE_LIBBZ2=y HAVE_LIBZ=y
 cp %{name} %{name}$MPI_SUFFIX
 make clean
-%{_mpich2_unload}
+%{_mpich_unload}
 %endif
 
 %install
@@ -136,12 +136,12 @@ mkdir -p %{buildroot}$MPI_BIN
 install -m 0755 %{name}$MPI_SUFFIX %{buildroot}$MPI_BIN
 %{_openmpi_unload}
 
-%if %mpich2
-# Ray-mpich2
-%{_mpich2_load}
+%if %mpich
+# Ray-mpich
+%{_mpich_load}
 mkdir -p %{buildroot}$MPI_BIN
 install -m 0755 %{name}$MPI_SUFFIX %{buildroot}$MPI_BIN
-%{_mpich2_unload}
+%{_mpich_unload}
 %endif
 
 # Ray-doc
@@ -168,9 +168,9 @@ rm -rf %{buildroot}
 %files openmpi
 %{_libdir}/openmpi/bin/%{name}*
 
-%if %mpich2
-%files mpich2
-%{_libdir}/mpich2/bin/%{name}*
+%if %mpich
+%files mpich
+%{_libdir}/mpich/bin/%{name}*
 %endif
 
 %files doc
@@ -181,6 +181,9 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/
 
 %changelog
+* Wed Sep 04 2013 Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca> - 2.1.0-8
+- Change dependency name from mpich2 to mpich
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild