[towhee/f19] Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
Deji Akingunola
deji at fedoraproject.org
Wed Jul 24 16:45:43 UTC 2013
commit 24c526a640276d4b6e6d80c1da2c1fc6d2c9a1ca
Author: Deji Akingunola <dakingun at gmail.com>
Date: Wed Jul 24 12:45:37 2013 -0400
Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
towhee.spec | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/towhee.spec b/towhee.spec
index 8a68285..05b2cc1 100644
--- a/towhee.spec
+++ b/towhee.spec
@@ -1,6 +1,6 @@
Name: towhee
Version: 7.0.4
-Release: 2%{?dist}.1
+Release: 3%{?dist}
Summary: A Monte Carlo molecular simulation code
Group: Applications/Engineering
License: GPLv2+
@@ -16,7 +16,7 @@ ExcludeArch: ppc64
BuildRequires: gcc-gfortran
BuildRequires: openmpi-devel
-BuildRequires: mpich2-devel
+BuildRequires: mpich-devel
%description
Towhee is a Monte Carlo molecular simulation code originally designed for the
@@ -46,14 +46,16 @@ Open MPI.
If you want the analysis tools, install the towhee package.
-%package mpich2
-Summary: Towhee, MPICH2 version
+%package mpich
+Summary: Towhee, MPICH version
Group: Applications/Engineering
Requires: towhee-common = %{version}-%{release}
-Requires: mpich2
+Requires: mpich
+Provides: %{name}-mpich2 = %{version}-%{release}
+Obsoletes: %{name}-mpich2 < 7.0.4-3
-%description mpich2
-This package contains MPI enabled binaries of Towhee, compiled against MPICH2.
+%description mpich
+This package contains MPI enabled binaries of Towhee, compiled against MPICH.
If you want the analysis tools, install the towhee package.
@@ -102,9 +104,6 @@ done
# Use gfortran, not g77.
export F77=gfortran
-# MPICH package is broken and needs to be specifically unloaded, first.
-%{_mpich2_unload}
-
## Build serial version
mkdir nompi
cd nompi
@@ -132,21 +131,21 @@ make %{?_smp_mflags}
cd ..
%{_openmpi_unload}
-%{_mpich2_load}
-mkdir mpich2
-cd mpich2
+%{_mpich_load}
+mkdir mpich
+cd mpich
ln -s ../configure .
%configure --enable-mpi --program-suffix=${MPI_SUFFIX}
make %{?_smp_mflags}
cd ..
-%{_mpich2_unload}
+%{_mpich_unload}
%install
rm -rf %{buildroot}
# Install binaries
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 mpich install DESTDIR=%{buildroot} bindir=%{_libdir}/mpich/bin INSTALL="install -p"
make -C nompi install DESTDIR=%{buildroot} INSTALL="install -p"
# Install force fields
@@ -163,7 +162,7 @@ for bin in {analyse_{movie,histogram},car2towhee,charmm2pdb,{faux,pdb,xmd,xtl,xy
mv %{buildroot}%{_bindir}/$bin %{buildroot}%{_bindir}/towhee-$bin
done
# Remove mpi versions of the utilities
-for mpi in openmpi mpich2; do
+for mpi in openmpi mpich; 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
@@ -184,9 +183,9 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_libdir}/openmpi/bin/*_openmpi
-%files mpich2
+%files mpich
%defattr(-,root,root,-)
-%{_libdir}/mpich2/bin/*_mpich2
+%{_libdir}/mpich/bin/*_mpich
%files common
%defattr(-,root,root,-)
@@ -202,6 +201,9 @@ rm -rf %{buildroot}
%doc Examples/*
%changelog
+* Wed Jul 24 2013 Deji Akingunola <dakingun at gmail.com> - 7.0.4-3
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.0.4-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list