[gromacs/el6] Drop MPICH2 since it's unavailable on ppc64.

[Jussi Lehtola]

commit 41fd7e66345768229e68e3f324e5ed518f0b775a
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sat Sep 17 02:32:29 2011 +0300

    Drop MPICH2 since it's unavailable on ppc64.

 gromacs.spec |  117 ++-------------------------------------------------------
 1 files changed, 5 insertions(+), 112 deletions(-)
---
diff --git a/gromacs.spec b/gromacs.spec
index af2f684..8f08bee 100644
--- a/gromacs.spec
+++ b/gromacs.spec
@@ -6,7 +6,7 @@
 
 Name:		gromacs
 Version:	4.5.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Fast, Free and Flexible Molecular Dynamics
 Group:		Applications/Engineering
 License:	GPLv2+
@@ -167,61 +167,6 @@ This package contains development libraries for GROMACS Open MPI.
 You may need it if you want to write your own analysis programs.
 %endif
 
-
-%package mpich2
-Summary:	GROMACS MPICH2 binaries and libraries
-Group:		Applications/Engineering
-Requires:	gromacs-common = %{version}-%{release}
-Requires:	mpich2
-# Libs were branched from gromacs, so there are 64-bit installs that have 32-bit packages installed
-Obsoletes:	gromacs-mpich2 < 4.5.3-2
-
-%description mpich2
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
-
-mdrun has been compiled with thread parallellization (for running on
-a single node) and with MPICH2 (for running on multiple nodes).
-This package single and double precision binaries and libraries.
-
-%package mpich2-libs
-Summary:	GROMACS MPICH2 shared libraries
-Group:		System Environment/Libraries
-Requires:	mpich2
-
-%description mpich2-libs
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
-
-This package contains libraries needed for operation of GROMACS MPICH2.
-
-
-%package mpich2-devel
-Summary:	GROMACS MPICH2 development libraries
-Group:		Applications/Engineering
-Requires:	gromacs-devel = %{version}-%{release}
-Requires:	gromacs-mpich2 = %{version}-%{release}
-BuildRequires:	mpich2-devel
-Requires:	mpich2-devel
-
-%description mpich2-devel
-GROMACS is a versatile and extremely well optimized package to perform
-molecular dynamics computer simulations and subsequent trajectory analysis.
-It is developed for biomolecules like proteins, but the extremely high
-performance means it is used also in several other field like polymer chemistry
-and solid state physics.
-
-This package contains development libraries for GROMACS MPICH2.
-You may need it if you want to write your own analysis programs.
-
-
-
 %package bash
 Summary:	GROMACS bash completion
 Group:		Applications/Engineering
@@ -308,9 +253,6 @@ This package provides tutorials for the use of GROMACS.
 
 
 %build
-# First, override bug in MPICH2 packaging.
-%{_mpich2_unload}
-
 # Assembly kernels haven't got .note.GNU-stack sections
 # because of incompatibilies with Microsoft Assembler.
 # Add noexecstack to compiler flags
@@ -373,30 +315,6 @@ cd ..
 %{_openmpi_unload}
 %endif
 
-
-## MPICH2
-%{_mpich2_load}
-# Suffix to be used for single precision is
-SUFFIXCONF="-D GMX_DEFAULT_SUFFIX=OFF -D GMX_BINARY_SUFFIX=$SUFFIX -D GMX_LIBS_SUFFIX=${MPI_SUFFIX}"
-# MPICH 2 is broken, so need to modify linker command
-export CC="mpicc -lstdc++"
-# single precision
-mkdir mpich2-single
-cd mpich2-single
-%cmake $DEFOPTS $SINGLE $MPI $SUFFIXCONF ..
-make VERBOSE=1 %{?_smp_mflags} mdrun
-cd ..
-# double precision
-# Suffix to be used for double precision is
-SUFFIXCONF="-D GMX_DEFAULT_SUFFIX=OFF -D GMX_BINARY_SUFFIX=$SUFFIX -D GMX_LIBS_SUFFIX=${MPI_SUFFIX}_d"
-mkdir mpich2-double
-cd mpich2-double
-%cmake $DEFOPTS $DOUBLE $MPI $SUFFIXCONF ..
-make VERBOSE=1 %{?_smp_mflags} mdrun
-cd ..
-%{_mpich2_unload}
-
-
 %install
 rm -rf %{buildroot}
 
@@ -419,23 +337,6 @@ cd ..
 %{_openmpi_unload}
 %endif
 
-## MPICH 2
-%{_mpich2_load}
-# Make install-mdrun target is broken, do install manually
-mkdir -p %{buildroot}%{_libdir}/mpich2/{bin,lib}
-# single precision
-cd mpich2-single
-install -p -m 755 src/kernel/mdrun %{buildroot}%{_libdir}/mpich2/bin/g_mdrun_mpich2
-cp -a src/*/*.so* %{buildroot}%{_libdir}/mpich2/lib/
-cd ..
-# double precision
-cd mpich2-double
-install -p -m 755 src/kernel/mdrun %{buildroot}%{_libdir}/mpich2/bin/g_mdrun_mpich2_d
-cp -a src/*/*.so* %{buildroot}%{_libdir}/mpich2/lib/
-cd ..
-%{_mpich2_unload}
-
-
 ## Serial versions
 
 # Single precision
@@ -566,18 +467,6 @@ rm -rf %{buildroot}
 %{_libdir}/openmpi/lib/lib*.so
 %endif
 
-%files mpich2
-%defattr(-,root,root,-)
-%{_libdir}/mpich2/bin/g_mdrun*
-
-%files mpich2-libs
-%defattr(-,root,root,-)
-%{_libdir}/mpich2/lib/lib*.so.*
-
-%files mpich2-devel
-%defattr(-,root,root,-)
-%{_libdir}/mpich2/lib/lib*.so
-
 %files zsh
 %defattr(-,root,root,-)
 %{_datadir}/zsh/site-functions/gromacs
@@ -598,6 +487,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Sep 17 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.5.4-3
+- Build in EL6.
+- Drop MPICH2 since it is not available on ppc64.
+
 * Wed Mar 30 2011 Deji Akingunola <dakingun at gmail.com> - 4.5.4-2
 - Rebuild for mpich2 soname bump