[mpi4py] use python2 macros instead of unversioned ones

[Thomas Spura]

commit f27fd666437a9f50eef1ec4cbec6b94fee039336
Author: Thomas Spura <thomas.spura at gmail.com>
Date:   Sat Mar 14 14:44:55 2015 +0100

    use python2 macros instead of unversioned ones

 mpi4py.spec | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/mpi4py.spec b/mpi4py.spec
index 62be182..eeb06a8 100644
--- a/mpi4py.spec
+++ b/mpi4py.spec
@@ -6,8 +6,8 @@
 %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")
 
 %{?filter_setup:
-%filter_provides_in %{python_sitearch}.*\.so$
-%filter_requires_in %{python_sitearch}/openmpi/mpi4py/lib-pmpi/lib.*\.so
+%filter_provides_in %{python2_sitearch}.*\.so$
+%filter_requires_in %{python2_sitearch}/openmpi/mpi4py/lib-pmpi/lib.*\.so
 %if 0%{?with_python3}
 %filter_provides_in %{python3_sitearch}.*\.so$
 %filter_requires_in %{python3_sitearch}/openmpi/mpi4py/lib-pmpi/lib.*\.so
@@ -232,8 +232,8 @@ rm -rf %{buildroot}
 %{_openmpi_load}
 mv openmpi build
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-mkdir -p %{buildroot}%{python_sitearch}/openmpi
-mv %{buildroot}%{python_sitearch}/%{name}/ %{buildroot}%{python_sitearch}/%{name}*.egg-info %{buildroot}%{python_sitearch}/openmpi
+mkdir -p %{buildroot}%{python2_sitearch}/openmpi
+mv %{buildroot}%{python2_sitearch}/%{name}/ %{buildroot}%{python2_sitearch}/%{name}*.egg-info %{buildroot}%{python2_sitearch}/openmpi
 mv build openmpi
 %{_openmpi_unload}
 
@@ -242,8 +242,8 @@ mv build openmpi
 %{_mpich_load}
 mv mpich build
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
-mkdir -p %{buildroot}%{python_sitearch}/mpich
-mv %{buildroot}%{python_sitearch}/%{name}/ %{buildroot}%{python_sitearch}/%{name}*.egg-info %{buildroot}%{python_sitearch}/mpich
+mkdir -p %{buildroot}%{python2_sitearch}/mpich
+mv %{buildroot}%{python2_sitearch}/%{name}/ %{buildroot}%{python2_sitearch}/%{name}*.egg-info %{buildroot}%{python2_sitearch}/mpich
 mv build mpich
 %{_mpich_unload}
 %endif
@@ -277,11 +277,11 @@ mv build mpich
 # test openmpi?
 %if 0%{?OPENMPI}
 %{_openmpi_load}
-PYTHONPATH=%{buildroot}%{python_sitearch}/openmpi \
+PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \
     mpiexec -np 1 python2 test/runtests.py
-PYTHONPATH=%{buildroot}%{python_sitearch}/openmpi \
+PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \
     mpiexec -np 5 python2 test/runtests.py
-PYTHONPATH=%{buildroot}%{python_sitearch}/openmpi \
+PYTHONPATH=%{buildroot}%{python2_sitearch}/openmpi \
     mpiexec -np 8 python2 test/runtests.py
 %{_openmpi_unload}
 %endif
@@ -290,11 +290,11 @@ PYTHONPATH=%{buildroot}%{python_sitearch}/openmpi \
 %if 0%{?MPICH}
 %if %{with_mpich}
 %{_mpich_load}
-PYTHONPATH=%{buildroot}%{python_sitearch}/mpich \
+PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \
     mpiexec -np 1 python2 test/runtests.py
-PYTHONPATH=%{buildroot}%{python_sitearch}/mpich \
+PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \
     mpiexec -np 5 python2 test/runtests.py
-PYTHONPATH=%{buildroot}%{python_sitearch}/mpich \
+PYTHONPATH=%{buildroot}%{python2_sitearch}/mpich \
     mpiexec -np 8 python2 test/runtests.py
 %{_mpich_unload}
 %endif
@@ -338,14 +338,14 @@ rm -rf %{buildroot}
 
 %files openmpi
 %defattr(-,root,root,-)
-%{python_sitearch}/openmpi/%{name}-%{version}-py?.?.egg-info
-%{python_sitearch}/openmpi/%{name}
+%{python2_sitearch}/openmpi/%{name}-%{version}-py?.?.egg-info
+%{python2_sitearch}/openmpi/%{name}
 
 %if %{with_mpich}
 %files mpich
 %defattr(-,root,root,-)
-%{python_sitearch}/mpich/%{name}-%{version}-py?.?.egg-info
-%{python_sitearch}/mpich/%{name}
+%{python2_sitearch}/mpich/%{name}-%{version}-py?.?.egg-info
+%{python2_sitearch}/mpich/%{name}
 %endif
 
 %if 0%{?with_python3}
@@ -370,6 +370,7 @@ rm -rf %{buildroot}
 %changelog
 * Sat Mar 14 2015 Thomas Spura <tomspur at fedoraproject.org> - 1.3.1-7
 - remove %%py3dir
+- use python2 macros instead of unversioned ones
 
 * Thu Mar 12 2015 Thomas Spura <tomspur at fedoraproject.org> - 1.3.1-6
 - Rebuild for changed mpich libraries