| |
@@ -9,7 +9,7 @@
|
| |
Summary: Python bindings for QtWebEngine
|
| |
Name: pyqtwebengine
|
| |
Version: 5.15.2
|
| |
- Release: 2%{?dist}
|
| |
+ Release: 3%{?dist}
|
| |
|
| |
License: GPLv3
|
| |
Url: https://www.riverbankcomputing.com/software/pyqt/
|
| |
@@ -36,8 +36,8 @@
|
| |
BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion}
|
| |
BuildRequires: python%{python3_pkgversion}-qt5
|
| |
BuildRequires: python%{python3_pkgversion}-qt5-devel
|
| |
- BuildRequires: python%{python3_pkgversion}-pyqt5-sip >= %{sip_ver}
|
| |
- BuildRequires: python%{python3_pkgversion}-sip-devel >= %{sip_ver}
|
| |
+ BuildRequires: %{py3_dist sip} >= 5.3
|
| |
+ BuildRequires: %{py3_dist PyQt-builder} >= 1
|
| |
%endif # with_python3
|
| |
|
| |
%description
|
| |
@@ -62,7 +62,7 @@
|
| |
# when webengine content was split out
|
| |
Conflicts: python2-qt5-devel < 5.12.1
|
| |
Conflicts: python%{python3_pkgversion}-qt5-devel < 5.12.1
|
| |
- Requires: sip
|
| |
+ Requires: %{py3_dist sip} >= 5.3
|
| |
BuildArch: noarch
|
| |
%description devel
|
| |
%{summary}.
|
| |
@@ -100,17 +100,16 @@
|
| |
|
| |
# Python 3 build:
|
| |
%if 0%{?with_python3}
|
| |
- mkdir %{_target_platform}-python3
|
| |
- pushd %{_target_platform}-python3
|
| |
- %{__python3} ../configure.py \
|
| |
+ sip-build \
|
| |
+ --no-make \
|
| |
--qmake=%{_qt5_qmake} \
|
| |
+ --api-dir=%{_qt5_datadir}/qsci/api/python \
|
| |
--verbose \
|
| |
- QMAKE_CFLAGS_RELEASE="%{build_cflags}" \
|
| |
- QMAKE_CXXFLAGS_RELEASE="%{build_cxxflags}" \
|
| |
- QMAKE_LFLAGS_RELEASE="%{build_ldflags}"
|
| |
+ --qmake-setting 'QMAKE_CFLAGS_RELEASE="%{build_cflags}"' \
|
| |
+ --qmake-setting 'QMAKE_CXXFLAGS_RELEASE="%{build_cxxflags}"' \
|
| |
+ --qmake-setting 'QMAKE_LFLAGS_RELEASE="%{build_ldflags}"'
|
| |
|
| |
- %make_build
|
| |
- popd
|
| |
+ %make_build -C build
|
| |
%endif # with_python3
|
| |
|
| |
|
| |
@@ -118,7 +117,7 @@
|
| |
|
| |
# Python 3 build:
|
| |
%if 0%{?with_python3}
|
| |
- %make_install INSTALL_ROOT=%{buildroot} -C %{_target_platform}-python3
|
| |
+ %make_install INSTALL_ROOT=%{buildroot} -C build
|
| |
|
| |
# ensure .so modules are executable for proper -debuginfo extraction
|
| |
for i in %{buildroot}%{python3_sitearch}/PyQt5/*.so ; do
|
| |
@@ -160,7 +159,7 @@
|
| |
|
| |
%files devel
|
| |
%license LICENSE
|
| |
- %{_datadir}/sip/PyQt5/QtWebEngine*/
|
| |
+ %{python3_sitearch}/PyQt5/bindings/QtWebEngine*/
|
| |
|
| |
%files doc
|
| |
# avoid dep on qscintilla-python, own %%_qt5_datadir/qsci/... here for now
|
| |
@@ -171,6 +170,9 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Thu Jun 10 2021 Scott Talbert <swt@techie.net> - 5.15.2-3
|
| |
+ - Update to build with sip 5
|
| |
+
|
| |
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 5.15.2-2
|
| |
- Rebuilt for Python 3.10
|
| |
|
| |
swt2c
commented 2 years ago
Please DON'T MERGE but do provide comments/approval. This is part of a coordinated move to sip5 in F35+.