From f204bce5f52a1e8d347ba2501a772810d3ab30f6 Mon Sep 17 00:00:00 2001
From: Deji Akingunola <dakingun@gmail.com>
Date: Jul 21 2013 22:56:31 +0000
Subject: Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0


---

diff --git a/pypar.spec b/pypar.spec
index b600fb0..58fd270 100644
--- a/pypar.spec
+++ b/pypar.spec
@@ -2,7 +2,7 @@
 
 Name:		pypar
 Version:	2.1.5_108
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Parallel programming with Python
 Group:		Development/Libraries
 License:	GPLv2+
@@ -50,22 +50,24 @@ standard MPI.
 
 This package contains pypar compiled against Open MPI.
 
-%package mpich2
+%package mpich
 Summary:        Parallel programming with Python, MPICH2 version
 Group:          Development/Libraries
 Requires:	%{name}-common = %{version}-%{release}
 Provides:	pypar-runtime = %{version}-%{release}
-BuildRequires:	mpich2-devel
+BuildRequires:	mpich-devel
 Requires:       numpy
-Requires:	mpich2
+Requires:	mpich
+Provides:	%{name}-mpich2 = %{version}-%{release}
+Obsoletes:	%{name}-mpich2 < 2.1.5_108-2
 
-%description mpich2
+%description mpich
 Pypar is an efficient but easy-to-use module that allows programs written in
 Python to run in parallel on multiple processors and communicate using message
 passing. Pypar provides bindings to a subset of the message passing interface
 standard MPI.
 
-This package contains pypar compiled against MPICH2.
+This package contains pypar compiled against MPICH.
 
 
 %prep
@@ -76,15 +78,15 @@ This package contains pypar compiled against MPICH2.
 tar zxf %{SOURCE0}
 
 # Make separate dirs for all MPI variants
-for mpi in openmpi mpich2; do 
+for mpi in openmpi mpich; do 
  cp -r pypar_%{version} $mpi
 done 
 
 # Clean out unneeded dir
 rm -rf pypar_%{version}
 
-# Prepare mpich2 source
-cd mpich2
+# Prepare mpich source
+cd mpich
 %patch0 -p1
 cd ..
 
@@ -108,11 +110,11 @@ cd -
 %{_openmpi_unload}
 
 # Build MPICH2 version
-%{_mpich2_load}
-cd mpich2/source
+%{_mpich_load}
+cd mpich/source
 CFLAGS="%{optflags}" python -c 'import setuptools; execfile("setup.py")' build
 cd -
-%{_mpich2_unload}
+%{_mpich_unload}
 
 
 %install
@@ -130,13 +132,13 @@ mv %{buildroot}%{python_sitearch}/pypar/ %{buildroot}%{python_sitearch}/Pypar*.e
 cd -
 %{_openmpi_unload}
 
-%{_mpich2_load}
-cd mpich2/source
+%{_mpich_load}
+cd mpich/source
 python -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
-mkdir -p %{buildroot}%{python_sitearch}/mpich2
-mv %{buildroot}%{python_sitearch}/pypar/ %{buildroot}%{python_sitearch}/Pypar*.egg-info %{buildroot}%{python_sitearch}/mpich2
+mkdir -p %{buildroot}%{python_sitearch}/mpich
+mv %{buildroot}%{python_sitearch}/pypar/ %{buildroot}%{python_sitearch}/Pypar*.egg-info %{buildroot}%{python_sitearch}/mpich
 cd -
-%{_mpich2_unload}
+%{_mpich_unload}
 
 
 %clean
@@ -151,12 +153,15 @@ rm -rf %{buildroot}
 %{python_sitearch}/openmpi/pypar/
 %{python_sitearch}/openmpi/Pypar*.egg-info
 
-%files mpich2
+%files mpich
 %defattr(-,root,root,-)
-%{python_sitearch}/mpich2/pypar/
-%{python_sitearch}/mpich2/Pypar*.egg-info
+%{python_sitearch}/mpich/pypar/
+%{python_sitearch}/mpich/Pypar*.egg-info
 
 %changelog
+* Sat Jul 20 2013 Deji Akingunola <dakingun@gmail.com> - 2.1.5_108-2
+- Rename mpich2 sub-packages to mpich and rebuild for mpich-3.0
+
 * Sat Feb 02 2013 Susi Lehtola <jussilehtola@fedoraproject.org> - 2.1.5_108-1
 - Update to 2.1.5_108.