move qt5 designer plugin from -devel to its own package [release 2.11.2-3mamba;Mon Aug 12 2019]
This commit is contained in:
parent
036366c7c9
commit
ab678d0b24
@ -1,6 +1,6 @@
|
||||
%define pythonsip_ver %(sip -V)
|
||||
Name: qscintilla
|
||||
Version: 2.10.8
|
||||
Version: 2.11.2
|
||||
Release: 3mamba
|
||||
Summary: A port to Qt of Neil Hodgson's Scintilla C++ editor control
|
||||
Group: Development/Tools
|
||||
@ -8,7 +8,8 @@ Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://www.riverbankcomputing.co.uk/software/qscintilla
|
||||
Source: https://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-%{version}/QScintilla_gpl-%{version}.tar.gz
|
||||
Source: https://www.riverbankcomputing.com/static/Downloads/QScintilla/%{version}/QScintilla_gpl-%{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
|
||||
Patch2: qscintilla-2.8.4-python-build-from-objdir.patch
|
||||
@ -16,20 +17,22 @@ Patch3: qscintilla-2.8.4-python-qsci-link.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libGL-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libpython-devel
|
||||
BuildRequires: libqt4-devel
|
||||
BuildRequires: libqt5-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
## AUTOBUILDREQ-END
|
||||
#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.4
|
||||
BuildRequires: python-sip-devel >= 4.19.18
|
||||
BuildRequires: python-sip-py3-devel >= 4.19.18
|
||||
BuildRequires: PyQt4-devel
|
||||
BuildRequires: PyQt5-devel
|
||||
#BuildRequires: chrpath
|
||||
%if "%?with_pyver"
|
||||
BuildRequires: PyQt4-py%{with_pyver}
|
||||
#BuildRequires: PyQt4-py%{with_pyver}
|
||||
BuildRequires: PyQt5-py%{with_pyver}
|
||||
%endif
|
||||
Requires: python-sip = %{pythonsip_ver}
|
||||
@ -89,9 +92,6 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
%if "%?with_pyver" == ""
|
||||
Provides: python-QScintilla2
|
||||
Obsoletes: python-QScintilla2
|
||||
%else
|
||||
Provides: python-qscintilla-py3
|
||||
Obsoletes: python-qscintilla-py3
|
||||
%endif
|
||||
|
||||
%description -n python-%{name}%{?with_pyver:-py%{pyver}}
|
||||
@ -103,7 +103,7 @@ Summary: Development files for QScintilla PyQt4 bindings
|
||||
Group: Development/Libraries
|
||||
Requires: python-%{name} = %{?epoch:%epoch:}%{version}-%{release}
|
||||
Requires: python-sip = %{pythonsip_ver}
|
||||
Requires: PyQt4
|
||||
Requires: PyQt5
|
||||
Provides: python-QScintilla2-devel
|
||||
Obsoletes: python-QScintilla2-devel
|
||||
|
||||
@ -127,9 +127,6 @@ sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro
|
||||
find doc example-Qt4Qt5 -type f -exec chmod 0644 {} ';'
|
||||
find src include -type f -exec chmod 0644 {} ';'
|
||||
|
||||
mkdir build-qt4
|
||||
cp -a * build-qt4/ || true
|
||||
|
||||
%build
|
||||
#:<< _EOF
|
||||
|
||||
@ -140,10 +137,8 @@ cd Qt4Qt5
|
||||
cd ..
|
||||
|
||||
cd designer-Qt4Qt5
|
||||
%{_qt5_qmake} designer.pro
|
||||
%{_qt5_qmake} QMAKE_LIBDIR=../Qt4Qt5 designer.pro
|
||||
%make
|
||||
#LFLAGS+="-L../Qt4Qt5 -shared -Wl,-O1"
|
||||
#INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
|
||||
cd ..
|
||||
|
||||
cd Python
|
||||
@ -159,44 +154,8 @@ cd Python
|
||||
%make CXX="c++ -I/usr/include/qt5/QtWidgets -I/usr/include/qt5/QtPrintSupport"
|
||||
cd ..
|
||||
|
||||
cd build-qt4
|
||||
cd Qt4Qt5
|
||||
#sed -i 's/INSTALLS += header trans qsci/INSTALLS += header trans qsci target/g' qscintilla.pro
|
||||
%{_qt4_qmake} qscintilla.pro
|
||||
%make
|
||||
cd ..
|
||||
|
||||
cd designer-Qt4Qt5
|
||||
%{_qt4_qmake} designer.pro
|
||||
%make
|
||||
#LFLAGS+="-L../Qt4Qt5 -shared -Wl,-O1"
|
||||
#INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
|
||||
cd ..
|
||||
|
||||
#cd Python
|
||||
#%{__python} configure.py \
|
||||
# -c \
|
||||
# -d %{python_sitearch}/PyQt5 \
|
||||
# --qsci-incdir=../Qt4Qt5 \
|
||||
# --qsci-libdir=../Qt4Qt5 \
|
||||
# --qmake /usr/bin/qmake-qt4 \
|
||||
# --pyqt=PyQt4
|
||||
#
|
||||
#% make
|
||||
cd ..
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
cd build-qt4
|
||||
%makeinstall -C Qt4Qt5 \
|
||||
INSTALL_ROOT=%{buildroot}
|
||||
|
||||
%makeinstall -C designer-Qt4Qt5 \
|
||||
INSTALL_ROOT=%{buildroot}
|
||||
|
||||
#% makeinstall -C Python INSTALL_ROOT=%{buildroot}
|
||||
|
||||
cd ..
|
||||
|
||||
%makeinstall -C Qt4Qt5 \
|
||||
INSTALL_ROOT=%{buildroot}
|
||||
@ -206,9 +165,6 @@ cd ..
|
||||
|
||||
%makeinstall -C Python INSTALL_ROOT=%{buildroot}
|
||||
|
||||
#chrpath --list %{buildroot}%{python_sitearch}/PyQt4/Qsci.so
|
||||
#chrpath --delete %{buildroot}%{python_sitearch}/PyQt4/Qsci.so
|
||||
|
||||
%clean
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
@ -217,16 +173,8 @@ cd ..
|
||||
/sbin/ldconfig
|
||||
:
|
||||
|
||||
#%post qt3 -p /sbin/ldconfig
|
||||
#%postun qt3 -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libqscintilla2_qt4.so.*
|
||||
%{_qt4_datadir}/translations/qscintilla_*.qm
|
||||
%dir %{_qt4_datadir}/qsci/api/python
|
||||
%{_qt4_datadir}/qsci/api/python/*.api
|
||||
# qt5
|
||||
%{_libdir}/libqscintilla2_qt5.so.*
|
||||
%{_qt5_datadir}/translations/qscintilla_*.qm
|
||||
%dir %{_qt5_datadir}/qsci/api/python
|
||||
@ -235,21 +183,15 @@ cd ..
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/qt4/Qsci
|
||||
%{_qt4_headerdir}/Qsci/*.h
|
||||
%{_libdir}/libqscintilla2_qt4.so
|
||||
%{_datadir}/qt4/mkspecs/features/qscintilla2.prf
|
||||
# qt5
|
||||
%{_qt5_headerdir}/Qsci/*.h
|
||||
%{_libdir}/libqscintilla2_qt5.so
|
||||
%{_libdir}/qt5/mkspecs/features/qscintilla2.prf
|
||||
%{_libdir}/qt5/plugins/designer/libqscintillaplugin.so
|
||||
%doc NEWS README
|
||||
%doc doc/html-Qt4Qt5 doc/Scintilla example-Qt4Qt5
|
||||
|
||||
%files designer
|
||||
%defattr(-,root,root)
|
||||
%{_qt4_prefix}/plugins/designer/libqscintillaplugin.so
|
||||
%{_qt5_prefix}/plugins/designer/libqscintillaplugin.so
|
||||
|
||||
%files -n python-%{name}%{?with_pyver:-py%{pyver}}
|
||||
%defattr(-,root,root)
|
||||
@ -262,9 +204,17 @@ cd ..
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/sip/PyQt5/Qsci
|
||||
%{_datadir}/sip/PyQt5/Qsci/*.sip
|
||||
#%{_datadir}/qt4/api/python/QScintilla2.api
|
||||
|
||||
%changelog
|
||||
* Mon Aug 12 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.2-3mamba
|
||||
- move qt5 designer plugin from -devel to its own package
|
||||
|
||||
* Fri Aug 09 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.2-2mamba
|
||||
- python-qscintilla-py36: don't obsolete python-qscintilla-py3
|
||||
|
||||
* Fri Aug 09 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.11.2-1mamba
|
||||
- update to 2.11.2
|
||||
|
||||
* Fri Apr 05 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 2.10.8-3mamba
|
||||
- python-qscintilla-py36: provide/obsolete python-qscintilla-py3
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user