Use Python version macros instead of hardcoded numbers

This should make it easier when we rebase python to 3.8.

There will be no 2.8, but for consistency, I've updated 27 as well.
This commit is contained in:
Miro Hrončok 2019-02-04 11:41:12 +01:00
parent 081b85cab4
commit 575500ddcb

View File

@ -1228,13 +1228,13 @@ fi
%if %{with python2} %if %{with python2}
%files numpy2 %files numpy2
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_numpy27.so.%{sonamever} %{_libdir}/libboost_numpy%{python2_version_nodots}.so.%{sonamever}
%endif %endif
%if %{with python3} %if %{with python3}
%files numpy3 %files numpy3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_numpy37.so.%{sonamever} %{_libdir}/libboost_numpy%{python3_version_nodots}.so.%{sonamever}
%endif %endif
%files test %files test
@ -1249,23 +1249,23 @@ fi
%if %{with python2} %if %{with python2}
%files python2 %files python2
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_python27.so.%{sonamever} %{_libdir}/libboost_python%{python2_version_nodots}.so.%{sonamever}
%files python2-devel %files python2-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_numpy27.so %{_libdir}/libboost_numpy%{python2_version_nodots}.so
%{_libdir}/libboost_python27.so %{_libdir}/libboost_python%{python2_version_nodots}.so
%endif %endif
%if %{with python3} %if %{with python3}
%files python3 %files python3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_python37.so.%{sonamever} %{_libdir}/libboost_python%{python3_version_nodots}.so.%{sonamever}
%files python3-devel %files python3-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/libboost_numpy37.so %{_libdir}/libboost_numpy%{python3_version_nodots}.so
%{_libdir}/libboost_python37.so %{_libdir}/libboost_python%{python3_version_nodots}.so
%endif %endif
%files random %files random
@ -1386,12 +1386,12 @@ fi
%files openmpi-python2 %files openmpi-python2
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/openmpi/lib/libboost_mpi_python27.so.%{sonamever} %{_libdir}/openmpi/lib/libboost_mpi_python%{python2_version_nodots}.so.%{sonamever}
%{python2_sitearch}/openmpi/boost/ %{python2_sitearch}/openmpi/boost/
%files openmpi-python2-devel %files openmpi-python2-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/openmpi/lib/libboost_mpi_python27.so %{_libdir}/openmpi/lib/libboost_mpi_python%{python2_version_nodots}.so
%endif %endif
@ -1399,12 +1399,12 @@ fi
%files openmpi-python3 %files openmpi-python3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/openmpi/lib/libboost_mpi_python37.so.%{sonamever} %{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so.%{sonamever}
%{python3_sitearch}/openmpi/boost/ %{python3_sitearch}/openmpi/boost/
%files openmpi-python3-devel %files openmpi-python3-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/openmpi/lib/libboost_mpi_python37.so %{_libdir}/openmpi/lib/libboost_mpi_python%{python3_version_nodots}.so
%endif %endif
@ -1430,12 +1430,12 @@ fi
%files mpich-python2 %files mpich-python2
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/mpich/lib/libboost_mpi_python27.so.%{sonamever} %{_libdir}/mpich/lib/libboost_mpi_python%{python2_version_nodots}.so.%{sonamever}
%{python2_sitearch}/mpich/boost/ %{python2_sitearch}/mpich/boost/
%files mpich-python2-devel %files mpich-python2-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/mpich/lib/libboost_mpi_python27.so %{_libdir}/mpich/lib/libboost_mpi_python%{python2_version_nodots}.so
%endif %endif
@ -1443,12 +1443,12 @@ fi
%files mpich-python3 %files mpich-python3
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/mpich/lib/libboost_mpi_python37.so.%{sonamever} %{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so.%{sonamever}
%{python3_sitearch}/mpich/boost/ %{python3_sitearch}/mpich/boost/
%files mpich-python3-devel %files mpich-python3-devel
%license LICENSE_1_0.txt %license LICENSE_1_0.txt
%{_libdir}/mpich/lib/libboost_mpi_python37.so %{_libdir}/mpich/lib/libboost_mpi_python%{python3_version_nodots}.so
%endif %endif