diff --git a/python-qt5.spec b/python-qt5.spec index c130c9f..c28c935 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -30,7 +30,7 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 Version: 5.11.3 -Release: 0.2.%{snap}%{?dist} +Release: 0.3.%{snap}%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ @@ -259,7 +259,7 @@ pushd %{_target_platform} --assume-shared \ --confirm-license \ --qmake=%{_qt5_qmake} \ - --qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci \ + %{!?with_python3:--no-qsci-api}%{?with_python3:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \ --verbose \ QMAKE_CFLAGS_RELEASE="%{optflags}" \ QMAKE_CXXFLAGS_RELEASE="%{optflags}" \ @@ -278,7 +278,7 @@ pushd %{_target_platform}-python3 --assume-shared \ --confirm-license \ --qmake=%{_qt5_qmake} \ - --no-qsci-api \ + %{?with_python2:--no-qsci-api}%{!?with_python2:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \ %{?py3_sipdir:--sipdir=%{py3_sipdir}} \ --verbose \ QMAKE_CFLAGS_RELEASE="%{optflags}" \ @@ -413,13 +413,13 @@ sed -i \ %{python2_sitearch}/PyQt5/QtWebKitWidgets.* %endif -%files rpm-macros -%{rpm_macros_dir}/macros.pyqt5 - %files -n python2-qt5-devel %{_datadir}/sip/PyQt5/ %endif +%files rpm-macros +%{rpm_macros_dir}/macros.pyqt5 + %if 0%{?with_python3} %files -n python%{python3_pkgversion}-qt5 %{python3_sitearch}/PyQt5/Enginio.* @@ -505,6 +505,10 @@ sed -i \ %changelog +* Thu Aug 30 2018 Rex Dieter - 5.11.3-0.3.dev1808131157 +- unconditionally create rpm-macros +- handle api generation when one of python2/python3 is disabled + * Fri Aug 24 2018 Rex Dieter - 5.11.3-0.2.dev1808131157 - drop backward-compat py3_sipdir - drop dep on python?-sip, rely only on python?-pyqt?-sip-api