rpms/towhee/F-12 sources,1.3,1.4 towhee.spec,1.8,1.9

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/towhee/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23151

Modified Files:
	sources towhee.spec 
Log Message:
Update to 6.2.7 and adopt MPI guidelines.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	16 Jul 2009 16:38:59 -0000	1.3
+++ sources	20 Dec 2009 08:58:51 -0000	1.4
@@ -1 +1 @@
-1ea66130962bd79d24b6671b285fdef4  towhee-6.2.6.tar.gz
+5bc2922db7912a7dc6c6dccad1af6157  towhee-6.2.7.tar.gz


Index: towhee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/towhee/F-12/towhee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- towhee.spec	23 Oct 2009 12:11:30 -0000	1.8
+++ towhee.spec	20 Dec 2009 08:58:51 -0000	1.9
@@ -1,13 +1,12 @@
 Name:		towhee
-Version:	6.2.6
-Release:	4%{?dist}
+Version:	6.2.7
+Release:	1%{?dist}
 Summary:	A Monte Carlo molecular simulation code
 Group:		Applications/Engineering
 License:	GPLv2+
 URL:		http://towhee.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Provides:	towhee-executable = %{version}-%{release}
 Requires:	towhee-common = %{version}-%{release}
 
 # Bug 502883
@@ -17,32 +16,7 @@ ExcludeArch:	ppc64
 
 BuildRequires:	gcc-gfortran
 BuildRequires:	openmpi-devel
-
-# Check for mpi-selector or environment-modules
-%global selector 0
-%global modules 0
-
-%if 0%{?fedora} > 9
-%global modules 1
-%endif
-
-%if 0%{?rhel} == 4
-%global selector 1
-%endif
-
-%if 0%{?rhel} == 5
-%global selector 1
-%endif
-
-%if %modules == 1
-BuildRequires:	environment-modules
-%endif
-
-%if %selector == 1
-BuildRequires:	mpi-selector
-%endif
-
-# End MPI requires section
+BuildRequires:	mpich2-devel
 
 %description
 Towhee is a Monte Carlo molecular simulation code originally designed for the
@@ -58,24 +32,38 @@ N.B. Due to some general names the utili
 analyse_movie is now towhee-analyse_movie.
 
 
-%package mpi
-Summary:	Towhee, MPI version
+%package openmpi
+Summary:	Towhee, Open MPI version
 Group:		Applications/Engineering
-Provides:	towhee-executable = %{version}-%{release}
 Requires:	towhee-common = %{version}-%{release}
+Obsoletes:	towhee-mpi < %{version}-%{release}
+Provides:	towhee-mpi = %{version}-%{release}
+Requires:	openmpi
+
+%description openmpi
+This package contains MPI enabled binaries of Towhee, compiled against
+Open MPI.
+
+If you want the analysis tools, install the towhee package.
+
+%package mpich2
+Summary:        Towhee, Open MPI version
+Group:          Applications/Engineering
+Requires:       towhee-common = %{version}-%{release}
+Requires:       mpich2
+
+%description mpich2
+This package contains MPI enabled binaries of Towhee, compiled against MPICH2.
 
-%description mpi
-This package contains the MPI enabled binaries of Towhee.
+If you want the analysis tools, install the towhee package.
 
 
 %package common
 Summary:	Towhee common files
 Group:		Applications/Engineering
 # So that the package gets removed with the binaries
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
+Requires:	%{name} = %{version}-%{release}
 BuildArch:	noarch
-%endif
 
 %description common
 This package contains files needed for operation of Towhee.
@@ -83,11 +71,7 @@ This package contains files needed for o
 %package doc
 Summary:	Towhee manual
 Group:		Applications/Engineering
-# So that the package gets removed with the binaries
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
 BuildArch:	noarch
-%endif
 
 %description doc
 This package contains the HTML manual for Towhee.
@@ -95,16 +79,11 @@ This package contains the HTML manual fo
 %package examples
 Summary:	Towhee examples
 Group:		Applications/Engineering
-Requires:	towhee-executable = %{version}-%{release}
-%if 0%{?fedora} >= 11
 BuildArch:	noarch
-%endif
 
 %description examples
 This package contains examples for Towhee operation.
 
-
-
 %prep
 %setup -q
 # Fix Force field locations in examples
@@ -133,34 +112,34 @@ cd ..
 
 cd ..
 
-## Build parallel version
-# Load MPI enviroment
-
-%if %modules == 1
-#. /etc/profile.d/modules.sh
-module load openmpi-%{_arch}
-export CFLAGS="%{optflags}"
-%endif
-
-%if %selector == 1
-# Set MPI environment
-mpi-selector --set `mpi-selector --list | grep openmpi`
-source /etc/profile.d/mpi-selector.sh
-%endif
-
+## Build parallel versions
 # Use mpif90 to build
 export F77=mpif90
-mkdir mpi
-cd mpi
+
+%{_openmpi_load}
+mkdir openmpi
+cd openmpi
+ln -s ../configure .
+%configure --enable-mpi --program-suffix=${MPI_SUFFIX}
+make %{?_smp_mflags}
+cd ..
+%{_openmpi_unload}
+
+%{_mpich2_load}
+mkdir mpich2
+cd mpich2
 ln -s ../configure .
-%configure --enable-mpi --program-suffix=-mpi
+%configure --enable-mpi --program-suffix=${MPI_SUFFIX}
 make %{?_smp_mflags}
 cd ..
+%{_mpich2_unload}
+
 
 %install
 rm -rf %{buildroot} 
 # Install binaries
-make -C mpi install DESTDIR=%{buildroot} INSTALL="install -p"
+make -C openmpi install DESTDIR=%{buildroot} bindir=%{_libdir}/openmpi/bin INSTALL="install -p"
+make -C mpich2 install DESTDIR=%{buildroot} bindir=%{_libdir}/mpich2/bin INSTALL="install -p"
 make -C nompi install DESTDIR=%{buildroot} INSTALL="install -p"
 
 # Install force fields
@@ -174,16 +153,19 @@ find Examples/ -name "Makefile*" -exec r
 find Examples/ -type f -exec chmod 644 {} \;
 
 # Rename utilities
-for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}{,-mpi}; do
+for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}; do
  mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/towhee-$bin
 done
 # Remove mpi versions of the utilities
-rm %{buildroot}%{_bindir}/towhee-*-mpi
+for mpi in openmpi mpich2; do
+ for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xyz}2towhee,fitcoex,jre_to_towhee,maftodensity,rdf2pmfpair,unitcell}; do
+  rm %{buildroot}%{_libdir}/$mpi/bin/${bin}_${mpi}
+ done
+done
 
 %clean
 rm -rf %{buildroot} 
 
-
 %files
 %defattr(-,root,root,-)
 %doc license.gpl
@@ -192,11 +174,13 @@ rm -rf %{buildroot} 
 # Utils
 %{_bindir}/towhee-*
 
-%files mpi
+%files openmpi
 %defattr(-,root,root,-)
-%doc license.gpl
-%{_bindir}/forcefield-mpi
-%{_bindir}/towhee-mpi
+%{_libdir}/openmpi/bin/*_openmpi
+
+%files mpich2
+%defattr(-,root,root,-)
+%{_libdir}/mpich2/bin/*_mpich2
 
 %files common
 %defattr(-,root,root,-)
@@ -212,6 +196,9 @@ rm -rf %{buildroot} 
 %doc Examples/*
 
 %changelog
+* Sat Dec 19 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.7-1
+- Adopt MPI guidelines, fixing FTBFS in rawhide.
+
 * Fri Oct 23 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 6.2.6-4
 - Fix FTBFS problem caused by behaviour change of openmpi.