- up to 5.15.6

diff --git a/install.patch b/install.patch
deleted file mode 100644 (file)
index 4c4d529..0000000
--- a/install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- PyQt5_gpl-5.8.2/configure.py~      2017-03-30 08:46:57.000000000 +0000
-+++ PyQt5_gpl-5.8.2/configure.py       2017-05-16 16:48:18.543916862 +0000
-@@ -405,7 +405,7 @@
- 
-         self.inc_dir = sysconfig.get_python_inc()
-         self.venv_inc_dir = sysconfig.get_python_inc(prefix=sys.prefix)
--        self.module_dir = sysconfig.get_python_lib(plat_specific=1)
-+        self.module_dir = sysconfig.get_python_lib(plat_specific=1, prefix=sys.prefix)
-         self.debug = hasattr(sys, 'gettotalrefcount')
- 
-         if sys.platform == 'win32':

diff --git a/python-PyQtWebEngine.spec b/python-PyQtWebEngine.spec
deleted file mode 100644 (file)
index bc2c941..0000000
--- a/python-PyQtWebEngine.spec
+++ /dev/null
@@ -1,176 +0,0 @@
-# Conditional build:
-%bcond_without python2 # CPython 2.x modules
-%bcond_without python3 # CPython 3.x modules
-
-%define                module  PyQtWebEngine
-# minimal required sip version
-%define                sip_ver 2:4.19.14-1
-# last qt version covered by these bindings (minimal required is currently 5.0.0)
-# %define              qt_ver  %{version}
-%define                qt_ver  5.12.0
-
-%define                _enable_debug_packages  0
-
-Summary:       Python 2 bindings for the Qt5WebEngine module
-Summary(pl.UTF-8):     Wiązania Pythona 2 do modułu Qt5WebEngine
-Name:          python-%{module}
-Version:       5.15.5
-Release:       4
-License:       GPL v3
-Group:         Libraries/Python
-Source0:       https://pypi.python.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-%{version}.tar.gz
-# Source0-md5: 935e8948c6e2a4b41faa0734367ead43
-Patch0:                install.patch
-URL:           http://www.riverbankcomputing.com/software/pyqtwebengine/
-BuildRequires: Qt5WebEngine-devel >= %{qt_ver}
-BuildRequires: pkgconfig
-%if %{with python2}
-BuildRequires: python-PyQt5
-BuildRequires: python-PyQt5-sip >= %{sip_ver}
-BuildRequires: python-sip-devel >= %{sip_ver}
-%endif
-%if %{with python3}
-BuildRequires: python3-PyQt5
-BuildRequires: python3-PyQt5-sip >= %{sip_ver}
-BuildRequires: python3-sip-devel >= %{sip_ver}
-%endif
-BuildRequires: qt5-build >= %{qt_ver}
-BuildRequires: qt5-qmake >= %{qt_ver}
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.219
-BuildRequires: sip-PyQt5 >= 5.12
-Requires:      python-libs
-Requires:      python-PyQt5-sip >= %{sip_ver}
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define                _sipfilesdir    %{_datadir}/sip
-
-%description
-Python 2 bindings for the Qt5WebEngine module.
-
-%description -l pl.UTF-8
-Wiązania Pythona 2 do modułu Qt5WebEngine.
-
-%package -n python3-PyQtWebEngine
-Summary:       Python 3 bindings for the Qt5WebEngine module
-Summary(pl.UTF-8):     Wiązania Pythona 2 do modułu Qt5WebEngine
-Group:         Libraries/Python
-Requires:      python3-libs
-Requires:      python3-PyQt5-sip >= %{sip_ver}
-
-%description -n python3-PyQtWebEngine
-Python 3 bindings for the Qt5WebEngine module.
-
-%description -n python3-PyQtWebEngine -l pl.UTF-8
-Wiązania Pythona 2 do modułu Qt5WebEngine.
-
-%package -n sip-PyQtWebEngine
-Summary:        SIP files needed to build bindings for Qt5WebEngine
-Summary(pl.UTF-8):      Pliki SIP potrzebne do budowania wiązań do Qt5WebEngine
-Group:          Development/Languages/Python
-Requires:       sip >= %{sip_ver}
-
-%description -n sip-PyQtWebEngine
-SIP files needed to build bindings for Qt5WebEngine.
-
-%description -n sip-PyQtWebEngine -l pl.UTF-8
-Pliki SIP potrzebne do budowania wiązań do Qt5WebEngine.
-
-%package -n qscintilla2-%{module}-api
-Summary:        PyQtWebEngine API file for QScintilla
-Summary(pl.UTF-8):      Plik API PyQtWebEngine dla QScintilli
-Group:          Libraries/Python
-Requires:       qscintilla2-qt5 >= 2.2-2
-
-%description -n qscintilla2-%{module}-api
-PyQtWebEngine API file can be used by the QScintilla editor component
-to enable the use of auto-completion and call tips when editing
-PyQtWebEngine code.
-
-%description -n qscintilla2-%{module}-api -l pl.UTF-8
-Plik API PyQtWebEngine może być używany przez komponent edytora
-QScintilla aby umożliwić automatyczne dopełnianie i podpowiedzi przy
-modyfikowaniu kodu wykorzystującego PyQtWebEngine.
-
-%prep
-%setup -q -n PyQtWebEngine-%{version}
-%patch0 -p1
-
-%build
-%if %{with python2}
-install -d build-py2
-cd build-py2
-%{__python} ../configure.py \
-       --no-dist-info \
-       --verbose \
-       -c -j 3 \
-       -q "%{_bindir}/qmake-qt5"
-
-%{__make}
-cd ..
-%endif
-
-%if %{with python3}
-install -d build-py3
-cd build-py3
-%{__python3} ../configure.py \
-       --no-dist-info \
-       --verbose \
-       -c -j 3 \
-       -q "%{_bindir}/qmake-qt5"
-
-%{__make}
-cd ..
-%endif
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%if %{with python3}
-%{__make} -C build-py3 install \
-       INSTALL_ROOT=$RPM_BUILD_ROOT
-
-%endif
-
-%if %{with python2}
-%{__make} -C build-py2 install \
-       INSTALL_ROOT=$RPM_BUILD_ROOT
-
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %{with python2}
-%files
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/PyQt5/QtWebEngine.so
-%attr(755,root,root) %{py_sitedir}/PyQt5/QtWebEngineCore.so
-%attr(755,root,root) %{py_sitedir}/PyQt5/QtWebEngineWidgets.so
-%{py_sitedir}/PyQt5/QtWebEngine.pyi
-%{py_sitedir}/PyQt5/QtWebEngineCore.pyi
-%{py_sitedir}/PyQt5/QtWebEngineWidgets.pyi
-%endif
-
-%if %{with python3}
-%files -n python3-PyQtWebEngine
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py3_sitedir}/PyQt5/QtWebEngine.so
-%attr(755,root,root) %{py3_sitedir}/PyQt5/QtWebEngineCore.so
-%attr(755,root,root) %{py3_sitedir}/PyQt5/QtWebEngineWidgets.so
-%{py3_sitedir}/PyQt5/QtWebEngine.pyi
-%{py3_sitedir}/PyQt5/QtWebEngineCore.pyi
-%{py3_sitedir}/PyQt5/QtWebEngineWidgets.pyi
-%endif
-
-%files -n sip-PyQtWebEngine
-%defattr(644,root,root,755)
-%{_sipfilesdir}/PyQt5/QtWebEngine
-%{_sipfilesdir}/PyQt5/QtWebEngineCore
-%{_sipfilesdir}/PyQt5/QtWebEngineWidgets
-
-%files -n qscintilla2-%{module}-api
-%defattr(644,root,root,755)
-%{_datadir}/qt5/qsci/api/python/PyQtWebEngine.api

diff --git a/python3-PyQtWebEngine.spec b/python3-PyQtWebEngine.spec
new file mode 100644 (file)
index 0000000..922d4cd
--- /dev/null
+++ b/python3-PyQtWebEngine.spec
@@ -0,0 +1,85 @@
+
+%define                module  PyQtWebEngine
+# minimal required sip version
+%define                sip_ver 6.4
+# last qt version covered by these bindings (minimal required is currently 5.0.0)
+# %define              qt_ver  %{version}
+%define                qt_ver  5.15.0
+
+Summary:       Python bindings for the Qt5WebEngine module
+Summary(pl.UTF-8):     Wiązania Pythona do modułu Qt5WebEngine
+Name:          python3-%{module}
+Version:       5.15.6
+Release:       1
+License:       GPL v3
+Group:         Libraries/Python
+Source0:       https://pypi.python.org/packages/source/P/PyQtWebEngine/PyQtWebEngine-%{version}.tar.gz
+# Source0-md5: d1e548617de149ba8142a32c1eb9f994
+URL:           http://www.riverbankcomputing.com/software/pyqtwebengine/
+BuildRequires: Qt5WebEngine-devel >= %{qt_ver}
+BuildRequires: pkgconfig
+BuildRequires: python3-PyQt5
+BuildRequires: qt5-build >= %{qt_ver}
+BuildRequires: qt5-qmake >= %{qt_ver}
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.219
+BuildRequires: sip-PyQt5 >= 5.15.7
+BuildRequires: sip6 >= %{sip_ver}
+Requires:      python3-libs
+Obsoletes:     python-PyQtWebEngine < 5.15.6
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Python bindings for the Qt5WebEngine module.
+
+%description -l pl.UTF-8
+Wiązania Pythona do modułu Qt5WebEngine.
+
+%package -n sip-PyQtWebEngine
+Summary:       SIP files needed to build bindings for Qt5WebEngine
+Summary(pl.UTF-8):     Pliki SIP potrzebne do budowania wiązań do Qt5WebEngine
+Group:         Development/Languages/Python
+Requires:      python3-PyQt5-sip >= 2:12.11.0
+Requires:      sip >= %{sip_ver}
+
+%description -n sip-PyQtWebEngine
+SIP files needed to build bindings for Qt5WebEngine.
+
+%description -n sip-PyQtWebEngine -l pl.UTF-8
+Pliki SIP potrzebne do budowania wiązań do Qt5WebEngine.
+
+%prep
+%setup -q -n PyQtWebEngine-%{version}
+
+%build
+sip-build --build-dir build-py3 \
+       --jobs %{__jobs} \
+       --verbose \
+       --pep484-pyi \
+       --qmake="%{_bindir}/qmake-qt5" \
+       --scripts-dir=%{_bindir}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} -C build-py3 install \
+       INSTALL_ROOT=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/PyQt5/QtWebEngine.abi3.so
+%attr(755,root,root) %{py3_sitedir}/PyQt5/QtWebEngineCore.abi3.so
+%attr(755,root,root) %{py3_sitedir}/PyQt5/QtWebEngineWidgets.abi3.so
+%{py3_sitedir}/PyQt5/QtWebEngine.pyi
+%{py3_sitedir}/PyQt5/QtWebEngineCore.pyi
+%{py3_sitedir}/PyQt5/QtWebEngineWidgets.pyi
+%{py3_sitedir}/PyQtWebEngine-%{version}.dist-info
+
+%files -n sip-PyQtWebEngine
+%defattr(644,root,root,755)
+%{py3_sitedir}/PyQt5/bindings/QtWebEngine
+%{py3_sitedir}/PyQt5/bindings/QtWebEngineCore
+%{py3_sitedir}/PyQt5/bindings/QtWebEngineWidgets