diff --git a/qscintilla.spec b/qscintilla.spec index e2c814f..fa571e1 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -1,7 +1,7 @@ %define pythonsip_ver %(sip -V) Name: qscintilla Version: 2.8.4 -Release: 2mamba +Release: 4mamba Summary: A port to Qt of Neil Hodgson's Scintilla C++ editor control Group: Development/Tools Vendor: openmamba @@ -24,9 +24,12 @@ 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.16.1 +BuildRequires: python-sip-devel >= 4.16.4 BuildRequires: PyQt4-devel #BuildRequires: chrpath +%if "%?with_pyver" +BuildRequires: PyQt4-py%{with_pyver} +%endif Requires: python-sip = %{pythonsip_ver} Provides: QScintilla2 Obsoletes: QScintilla2 @@ -44,7 +47,19 @@ Scintilla includes features especially useful when editing and debugging source * margins can contain markers like those used in debuggers to indicate breakpoints and the current line. * recordable macros * multiple views printing. - + +%if "%?with_pyver" +%define pyver %{with_pyver} +%define __python %(rpm --eval %{__python%{with_pyver}}) +%define python_sitearch %(rpm --eval %{python%{with_pyver}_sitearch}) +%define python_sitelib %(rpm --eval %{python%{with_pyver}_sitelib}) +%define python_inc %(rpm --eval %{python%{with_pyver}_inc}) +%define python_version %(rpm --eval %{python%{with_pyver}_version}) +%define python_provides %(rpm --eval %{python%{with_pyver}_provides}) +%define python_requires %(rpm --eval %{python%{with_pyver}_requires}) +%define py_requires %(rpm --eval %{py%{with_pyver}_requires}) +%endif + %package devel Group: Development/Libraries Summary: Libraries and headers for %{name} @@ -54,31 +69,28 @@ Obsoletes: QScintilla2-devel %description devel QScintilla is a port to Qt of the Scintilla editing component. - This package contains libraries and header files need for development. %package designer Summary: QScintilla designer plugin Group: Development/Tools Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -Provides: QScintilla2-designer -Obsoletes: QScintilla2-designer %description designer QScintilla is a port to Qt of the Scintilla editing component. - This package contains QScintilla designer plugin. -%package -n python-%{name} +%package -n python-%{name}%{?with_pyver:-py%{pyver}} Summary: QScintilla PyQt4 bindings Group: Development/Libraries Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +%if "%?with_pyver" == "" Provides: python-QScintilla2 Obsoletes: python-QScintilla2 +%endif -%description -n python-%{name} +%description -n python-%{name}%{?with_pyver:-py%{pyver}} QScintilla is a port to Qt of the Scintilla editing component. - This package contains QScintilla PyQt4 bindings. %package -n python-%{name}-devel @@ -185,7 +197,7 @@ cd .. %defattr(-,root,root) %{_qt4_prefix}/plugins/designer/libqscintillaplugin.so -%files -n python-%{name} +%files -n python-%{name}%{?with_pyver:-py%{pyver}} %defattr(-,root,root) %{python_sitearch}/PyQt4/Qsci.so @@ -196,6 +208,12 @@ cd .. #%{_datadir}/qt4/api/python/QScintilla2.api %changelog +* Sat Nov 15 2014 Silvan Calarco 2.8.4-4mamba +- added -py3 support + +* Sat Nov 15 2014 Silvan Calarco 2.8.4-3mamba +- rebuilt with python-sip 4.16.4 + * Sun Nov 02 2014 Silvan Calarco 2.8.4-2mamba - x86_64: install python module in %python_sitearch