Accepting request 846245 from KDE:Qt5

- Use sip5 where available

OBS-URL: https://build.opensuse.org/request/show/846245
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-qtwebengine-qt5?expand=0&rev=8

python-qtwebengine-qt5.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 15 17:29:26 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Use sip5 where available
+
 -------------------------------------------------------------------
 Mon Sep 14 15:57:05 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
 

python-qtwebengine-qt5.spec

@@ -16,22 +16,35 @@
 #
 
 
+%if 0%{suse_version} < 1550
+%define use_sip4 1
+%endif
+
+%define oldpython python
+%define mname qtwebengine-qt5
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-qtwebengine-qt5
+Name:           python-%{mname}
 Version:        5.15.1
 Release:        0
 Summary:        Python bindings for the Qt5 WebEngine framework
 License:        GPL-3.0-only
-Group:          Development/Libraries/Python
+Group:          Development/Libraries/C and C++
 URL:            https://www.riverbankcomputing.com/software/pyqtwebengine/intro
 Source:         https://files.pythonhosted.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-%{version}.tar.gz
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module qt5-devel}
-BuildRequires:  %{python_module sip-devel >= 4.19.4}
+BuildRequires:  python-pyqt-rpm-macros
 BuildRequires:  python-rpm-macros
 BuildRequires:  pkgconfig(Qt5WebEngine)
-Requires:       python-qt5
+%if 0%{?use_sip4}
+BuildRequires:  %{python_module sip4-devel >= 4.19.4}
 Requires:       python-sip(api) = %{python_sip_api_ver}
+%else
+BuildRequires:  %{python_module pyqt-builder}
+BuildRequires:  %{python_module sip-devel >= 5.3}
+%requires_eq    python-qt5-sip
+%endif
+Requires:       python-qt5
 
 %python_subpackages
 
@@ -40,52 +53,34 @@ PyQtWebEngine is a set of Python bindings for the Qt5 WebEngine
 framework. The framework provides the ability to embed web
 content in applications.
 
-%package     -n %{name}-api
+%package api
 Summary:        Eric API files for %{name}
-Group:          Development/Tools/IDE
+Group:          Development/Libraries/C and C++
-Provides:       %{python_module qtwebengine-qt5-api = %{version}}
+Supplements:    packageand(eric:python-%{mname})
-Supplements:    packageand(eric:%{python2_prefix}-qtwebengine-qt5)
-Supplements:    packageand(eric:python3-qtwebengine-qt5)
-BuildArch:      noarch
 
-%description -n %{name}-api
+%description api
-This package provides Qt5 WebEngine framework API files for the Eric
+This package provides Qt5 WebEngine framework API files for the Eric IDE.
-IDE.
 
-%package     -n %{name}-sip
+%package sip
 Summary:        Sip files for %{name}
 Group:          Development/Libraries/Python
-Provides:       %{python_module qtwebengine-qt5-sip = %{version}}
+Supplements:    packageand(python-sip:python-%{mname}) 
-Supplements:    packageand(%{python2_prefix}-sip:%{python2_prefix}-qtwebengine-qt5)
+Provides:       %{oldpython}-%{mname}-sip = %{version}-%{release}
-Supplements:    packageand(python3-sip:python3-qtwebengine-qt5)
+Obsoletes:      %{oldpython}-%{mname}-sip < %{version}-%{release}
-BuildArch:      noarch
+Requires:       python-qt5-devel
 
-%description -n %{name}-sip
+%description sip
-This package contains sip files used to generate
+This package provides the SIP files used to generate the Python bindings for
-bindings to the Qt5 WebEngine framework.
+%{name}
 
 %prep
 %autosetup -p1 -n PyQtWebEngine-%{version}
-%{python_expand mkdir build_%{$python_bin_suffix}
-cp *.py build_%{$python_bin_suffix}
-cp -r sip build_%{$python_bin_suffix}
-}
 
 %build
-%{python_expand pushd build_%{$python_bin_suffix}
+%pyqt_build
-$python configure.py \
-    --no-dist-info \
-    --qmake=%{_bindir}/qmake-qt5
-
-make %{?_smp_mflags}
-popd
-}
 
 %install
-%{python_expand pushd build_%{$python_bin_suffix}
+%pyqt_install
-%make_install INSTALL_ROOT=%{buildroot}
-popd
-}
 
 %files %{python_files}
 %license LICENSE
@@ -94,16 +89,17 @@ popd
 %{python_sitearch}/PyQt5/QtWebEngine.*
 %{python_sitearch}/PyQt5/QtWebEngineCore.*
 %{python_sitearch}/PyQt5/QtWebEngineWidgets.*
+%{python_sitearch}/PyQtWebEngine-%{version}.dist-info/
 
-%files -n %{name}-api
+%files %{python_files api}
 %license LICENSE
-%dir %{_datadir}/qt5/qsci/api/python/
+%dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/
-%{_datadir}/qt5/qsci/api/python/PyQtWebEngine.api
+%{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/PyQtWebEngine.api
 
-%files -n %{name}-sip
+%files %{python_files sip}
 %license LICENSE
-%{_datadir}/sip/PyQt5/QtWebEngine/
+%{pyqt5_sipdir}/QtWebEngine/
-%{_datadir}/sip/PyQt5/QtWebEngineCore/
+%{pyqt5_sipdir}/QtWebEngineCore/
-%{_datadir}/sip/PyQt5/QtWebEngineWidgets/
+%{pyqt5_sipdir}/QtWebEngineWidgets/
 
 %changelog