python-qscintilla-devel: fix requirement for python-qscintilla -> python-qscintilla-py3 [release 2.11.4-3mamba;Sun Apr 12 2020]
This commit is contained in:
parent
cd035d23e3
commit
5e3e8736d5
@ -1,14 +1,14 @@
|
||||
%define pythonsip_ver %(sip -V)
|
||||
%define pythonsip_ver %(sip5 -V)
|
||||
Name: qscintilla
|
||||
Version: 2.11.2
|
||||
Release: 4mamba
|
||||
Version: 2.11.4
|
||||
Release: 3mamba
|
||||
Summary: A port to Qt of Neil Hodgson's Scintilla C++ editor control
|
||||
Group: Development/Tools
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://www.riverbankcomputing.co.uk/software/qscintilla
|
||||
Source: https://www.riverbankcomputing.com/static/Downloads/QScintilla/%{version}/QScintilla_gpl-%{version}.tar.gz
|
||||
Source: https://www.riverbankcomputing.com/static/Downloads/QScintilla/%{version}/QScintilla-%{version}.tar.gz
|
||||
#Source: https://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-%{version}/QScintilla_gpl-%{version}.tar.gz
|
||||
Patch0: qscintilla-2.7.2-prepend-local-includes.patch
|
||||
Patch1: qscintilla-2.10.8-designer-prepend-local-includes.patch
|
||||
@ -26,8 +26,8 @@ BuildRequires: libstdc++6-devel
|
||||
#BuildRequires: qt-designer
|
||||
# following build requirements are for Python bindings
|
||||
# WARNING: do not parametrize python-sip-devel version or it will be useless for ports
|
||||
BuildRequires: python-sip-devel >= 4.19.19
|
||||
BuildRequires: python-sip-py3-devel >= 4.19.19
|
||||
BuildRequires: python-sip-py3 >= 5.1.2
|
||||
BuildRequires: python-sip-py36 >= 5.1.2
|
||||
BuildRequires: PyQt4-devel
|
||||
BuildRequires: PyQt5-devel
|
||||
#BuildRequires: chrpath
|
||||
@ -35,7 +35,6 @@ BuildRequires: PyQt5-devel
|
||||
#BuildRequires: PyQt4-py%{with_pyver}
|
||||
BuildRequires: PyQt5-py%{with_pyver}
|
||||
%endif
|
||||
Requires: python-sip = %{pythonsip_ver}
|
||||
Provides: QScintilla2
|
||||
Obsoletes: QScintilla2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
@ -89,7 +88,7 @@ This package contains QScintilla designer plugin.
|
||||
Summary: QScintilla PyQt4 bindings
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
Requires: python-sip%{?with_pyver:-py%{pyver}} = %{pythonsip_ver}
|
||||
Requires: python-sip%{?with_pyver:-py%{pyver}} >= %{pythonsip_ver}
|
||||
%if "%?with_pyver" == ""
|
||||
Provides: python-QScintilla2
|
||||
Obsoletes: python-QScintilla2
|
||||
@ -102,8 +101,7 @@ This package contains QScintilla PyQt4 bindings.
|
||||
%package -n python-%{name}-devel
|
||||
Summary: Development files for QScintilla PyQt4 bindings
|
||||
Group: Development/Libraries
|
||||
Requires: python-%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
Requires: python-sip = %{pythonsip_ver}
|
||||
Requires: python-%{name}-py3 = %{?epoch:%epoch:}%{version}-%{release}
|
||||
Provides: python-QScintilla2-devel
|
||||
Obsoletes: python-QScintilla2-devel
|
||||
|
||||
@ -112,8 +110,10 @@ QScintilla is a port to Qt of the Scintilla editing component.
|
||||
|
||||
This package contains development files for QScintilla PyQt4 bindings.
|
||||
|
||||
#% debug_package
|
||||
|
||||
%prep
|
||||
%setup -q -n QScintilla_gpl-%{version}
|
||||
%setup -q -n QScintilla-%{version}
|
||||
#-D -T
|
||||
#:<< _EOF
|
||||
#%patch0 -p1
|
||||
@ -186,7 +186,7 @@ cd ..
|
||||
%{_qt5_headerdir}/Qsci/*.h
|
||||
%{_libdir}/libqscintilla2_qt5.so
|
||||
%{_libdir}/qt5/mkspecs/features/qscintilla2.prf
|
||||
%doc NEWS README
|
||||
%doc NEWS
|
||||
%doc doc/html-Qt4Qt5 doc/Scintilla example-Qt4Qt5
|
||||
|
||||
%files designer
|
||||
@ -206,6 +206,15 @@ cd ..
|
||||
%{_datadir}/sip/PyQt5/Qsci/*.sip
|
||||
|
||||
%changelog
|
||||
* Sun Apr 12 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.4-3mamba
|
||||
- python-qscintilla-devel: fix requirement for python-qscintilla -> python-qscintilla-py3
|
||||
|
||||
* Sun Apr 12 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.4-2mamba
|
||||
- fix requirements for python-sip
|
||||
|
||||
* Sat Apr 11 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.4-1mamba
|
||||
- update to 2.11.4
|
||||
|
||||
* Thu Oct 31 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.2-4mamba
|
||||
- rebuilt with python-sip 4.19.19
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user