- unified python2/python3 suffixes and default chosing with shiboken

diff --git a/python-PySide.spec b/python-PySide.spec
index ca8c5b4ccdb64ca7f10b32e112221621d229e094..418c0031161147b565784119e3694bdd071f4ce7 100644 (file)
--- a/python-PySide.spec
+++ b/python-PySide.spec
@@ -5,6 +5,7 @@
 %bcond_with    apidocs         # build API documentation (needs Qt sources)
 %bcond_without python2         # CPython 2.x module
 %bcond_without python3         # CPython 3.x module
+%bcond_with    python3_default # default to python3
 #
 Summary:       PySide - Python bindings for the Qt 4 toolkit
 Summary(pl.UTF-8):     PySide - wiązania Pythona do toolkitu Qt 4
@@ -136,9 +137,10 @@ Pliki programistyczne dla wiązań PySide dla Pythona 3.
 
 %build
 %if %{with python2}
-install -d build
-cd build
-%cmake ..
+install -d build-py2
+cd build-py2
+%cmake .. \
+       -DPYTHON_SUFFIX=-python%{py_ver}
 
 %{__make}
 cd ..
@@ -154,23 +156,24 @@ cd build-py3
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%if %{with python2}
-%{__make} -C build install \
+# version installed as last will be default (it covers default PYTHON_SUFFIX in cmake files and .pc symlink)
+for pyver in %{?with_python3_default:%{?with_python2:py2}} %{?with_python3:py3} %{!?with_python3_default:%{?with_python2:py2}} ; do
+
+%{__make} -C build-${pyver} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__mv} $RPM_BUILD_ROOT%{_pkgconfigdir}/{pyside,pyside-py%{py_ver}}.pc
+%{__mv} $RPM_BUILD_ROOT%{_pkgconfigdir}/pyside.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/pyside-${pyver}.pc
+ln -sf pyside-${pyver}.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/pyside.pc
+
+done
 
+%if %{with python2}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}/PySide
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/PySide
 %py_postclean
 %endif
 
 %if %{with python3}
-%{__make} -C build-py3 install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__mv} $RPM_BUILD_ROOT%{_pkgconfigdir}/{pyside,pyside-py%{py3_ver}}.pc
-
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/PySide
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}/PySide
 %endif
@@ -210,7 +213,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpyside-python%{py_ver}.so
-%{_pkgconfigdir}/pyside-py%{py_ver}.pc
+%{_pkgconfigdir}/pyside-py2.pc
+%{!?with_python3_default:%{_pkgconfigdir}/pyside.pc}
 %{_libdir}/cmake/PySide-%{pyside_ver}/PySideConfig-python%{py_ver}.cmake
 %endif
 
@@ -253,6 +257,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n python3-PySide-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpyside.%{py3_soabi}.so
-%{_pkgconfigdir}/pyside-py%{py3_ver}.pc
+%{_pkgconfigdir}/pyside-py3.pc
+%{?with_python3_default:%{_pkgconfigdir}/pyside.pc}
 %{_libdir}/cmake/PySide-%{pyside_ver}/PySideConfig.%{py3_soabi}.cmake
 %endif