| |
@@ -6,10 +6,10 @@
|
| |
#global bootstrap 1
|
| |
|
| |
%if ! 0%{?bootstrap}
|
| |
- %global python2 1
|
| |
+ %{!?el8:%global python2 1}
|
| |
%global python3 1
|
| |
%endif
|
| |
- %global qt4 1
|
| |
+ %{!?el8:%global qt4 1}
|
| |
%global qt5 1
|
| |
|
| |
## f29+ no longer using separate sipdir for python3
|
| |
@@ -23,7 +23,7 @@
|
| |
Summary: A Scintilla port to Qt
|
| |
Name: qscintilla
|
| |
Version: 2.11.2
|
| |
- Release: 5%{?dist}
|
| |
+ Release: 6%{?dist}
|
| |
|
| |
License: GPLv3
|
| |
Url: http://www.riverbankcomputing.com/software/qscintilla/
|
| |
@@ -39,7 +39,9 @@
|
| |
Patch101: QScintilla_gpl-2.11-QUrl.patch
|
| |
|
| |
BuildRequires: gcc-c++
|
| |
+ %if 0%{?qt4}
|
| |
BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml)
|
| |
+ %endif
|
| |
%if 0%{?qt5}
|
| |
BuildRequires: pkgconfig(Qt5Designer) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets)
|
| |
%endif
|
| |
@@ -109,20 +111,26 @@
|
| |
%package -n python3-qscintilla
|
| |
Summary: QScintilla python3 bindings
|
| |
BuildRequires: python3-devel
|
| |
+ %if 0%{?qt4}
|
| |
BuildRequires: python3-PyQt4-devel
|
| |
- BuildRequires: python2-sip-devel >= %{sip_ver}
|
| |
+ %endif
|
| |
+ BuildRequires: python3-sip-devel >= %{sip_ver}
|
| |
Provides: %{name}-python3 = %{version}-%{release}
|
| |
Provides: python3-PyQt5-Qsci = %{version}-%{release}
|
| |
Requires: %{name}%{?_isa} = %{version}-%{release}
|
| |
+ %if 0%{?qt4}
|
| |
Requires: python3-PyQt4
|
| |
%{?_sip_api:Requires: python3-pyqt4-sip-api(%{_sip_api_major}) >= %{_sip_api}}
|
| |
+ %endif
|
| |
%description -n python3-qscintilla
|
| |
%{summary}.
|
| |
|
| |
%package -n python3-qscintilla-devel
|
| |
Summary: Development files for QScintilla python3 bindings
|
| |
Provides: %{name}-python3-devel = %{version}-%{release}
|
| |
+ %if 0%{?qt4}
|
| |
Requires: python3-PyQt4-devel
|
| |
+ %endif
|
| |
BuildArch: noarch
|
| |
%description -n python3-qscintilla-devel
|
| |
%{summary}.
|
| |
@@ -259,7 +267,7 @@
|
| |
%{__python3} \
|
| |
configure.py --verbose \
|
| |
--pyqt=PyQt5 \
|
| |
- --sip=/usr/bin/sip-pyqt5 \
|
| |
+ --sip=/usr/bin/sip%{!?el8:-pyqt5} \
|
| |
--qsci-incdir=../Qt5 --qsci-libdir=../Qt5
|
| |
|
| |
%make_build
|
| |
@@ -412,6 +420,9 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Mon Sep 9 2019 Orion Poplawski <orion@nwra.com> - 2.11.2-6
|
| |
+ - Build without python2 and qt4 for EPEL8
|
| |
+
|
| |
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2.11.2-5
|
| |
- Rebuilt for Python 3.8
|
| |
|
| |
orion
commented 4 years ago
Not entirely sure this is correct, please review. sip for RHEL8.0 only ships /usr/bin/sip (python3), and RHEL8.0 does not have Qt4.
EPEL8 scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=37572398
F32 scratch build (should be the same): https://koji.fedoraproject.org/koji/taskinfo?taskID=37572399