Attachment 7174 Details for Bug 17039 – A patch to qscintilla.spec

[patch] A patch to qscintilla.spec

qscintilla.spec.patch (text/plain), 6.80 KB, created by Nicolas Salguero on 2015-10-29 15:28:58 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Nicolas Salguero

Created: 2015-10-29 15:28:58 CET

Size: 6.80 KB

patch

obsolete

>Index: qscintilla.spec
>===================================================================
>--- qscintilla.spec	(rÃ©vision 895805)
>+++ qscintilla.spec	(copie de travail)
>@@ -3,11 +3,16 @@
> Name:		qscintilla
> Summary:	Port to Qt of Neil Hodgson's Scintilla C++ editor class
> Version:	2.9
>-Release:	%mkrel 4
>+Release:	%mkrel 5
> License:	GPLv2+
> Group:		System/Libraries
> Source0:	http://downloads.sourceforge.net/pyqt/QScintilla-gpl-%{version}.tar.gz
>+Patch0:		QScintilla-gpl-2.9-build-both-qt4-qt5.patch
> URL:		http://www.riverbankcomputing.co.uk/software/qscintilla/intro
>+BuildRequires:	qt4-devel >= 4:4.3.1
>+BuildRequires:	python-sip >= 1:4.12.0
>+BuildRequires:	python-qt4-devel >= 4.10
>+BuildRequires:	python-devel
> BuildRequires:	pkgconfig(Qt5Widgets)
> BuildRequires:	pkgconfig(Qt5PrintSupport)
> BuildRequires:	pkgconfig(Qt5Designer)
>@@ -44,6 +49,26 @@
> Translations used by %{name}.
> 
> %files i18n
>+%{_qt4_translationdir}/qscintilla*.qm
>+
>+%package qt5-i18n
>+Summary: Translations used by %{name}
>+Group: System/Libraries
>+BuildArch: noarch
>+Obsoletes: qscintilla-translations
>+Conflicts: libqscintilla-qt4_2
>+Conflicts: lib64qscintilla-qt4_2
>+Conflicts: libqscintilla2_7
>+Conflicts: lib64qscintilla2_7
>+Conflicts: libqscintilla2_8
>+Conflicts: lib64qscintilla2_8
>+Conflicts: libqscintilla2_9 < 2.7.2-2
>+Conflicts: lib64qscintilla2_9 < 2.7.2-2
>+
>+%description qt5-i18n
>+Translations used by %{name}.
>+
>+%files qt5-i18n
> %{_qt5_translationdir}/qscintilla*.qm
> 
> #--------------------------------------------------------------
>@@ -67,17 +92,60 @@
> multiple foreground and background colours and multiple fonts.
> 
> %files -n %libqs4
>-%{_qt5_libdir}/libqscintilla2.so.%{major}
>-%{_qt5_libdir}/libqscintilla2.so.%{major}.*
>+%{_qt4_libdir}/libqscintilla2.so.%{major}
>+%{_qt4_libdir}/libqscintilla2.so.%{major}.*
> 
>+%define libqs5 %mklibname qt5scintilla2_ %{major}
>+
>+%package -n %libqs5
>+Summary: Port to Qt of Neil Hodgson's Scintilla C++ editor class
>+Group: System/Libraries
>+Requires: %{name}-qt5-i18n
>+
>+%description -n %libqs5
>+As well as features found in standard text editing components,
>+QScintilla includes features especially useful when editing and
>+debugging source code. These include support for syntax styling, error
>+indicators, code completion and call tips. The selection margin can
>+contain markers like those used in debuggers to indicate breakpoints
>+and the current line. Styling choices are more open than with many
>+editors, allowing the use of proportional fonts, bold and italics,
>+multiple foreground and background colours and multiple fonts.
>+
>+%files -n %libqs5
>+%{_qt5_libdir}/libqt5scintilla2.so.%{major}
>+%{_qt5_libdir}/libqt5scintilla2.so.%{major}.*
>+
> #--------------------------------------------------------------
> 
>-%define libqs5dev %mklibname -d qscintilla
>+%define libqs4dev %mklibname -d qscintilla
> 
>+%package -n %libqs4dev
>+Summary: Libraries, include and other files to develop applications with QScintilla for Qt
>+Group: Development/KDE and Qt
>+Requires: %libqs4 = %{version}-%{release}
>+Provides: %{name}-qt4-devel = %{version}-%{release}
>+Obsoletes: %{_lib}qscintilla-qt4_-devel
>+Obsoletes: %{_lib}qscintilla-qt4-devel < 2.6-2
>+Provides: qscintilla-qt4-devel = %{version}-%{release}
>+Conflicts: %{_lib}qscintilla-qt3_2 <= 2.2-2
>+
>+%description -n %libqs4dev
>+This packages contains the libraries, include and other files
>+you can use to develop applications with QScintilla.
>+
>+%files -n %libqs4dev
>+%{_qt4_includedir}/*
>+%{_qt4_libdir}/libqscintilla2.so
>+%{_qt4_prefix}/mkspecs/features/qscintilla2.prf
>+%{_qt4_plugindir}/designer/*
>+
>+%define libqs5dev %mklibname -d qt5scintilla
>+
> %package -n %libqs5dev
> Summary: Libraries, include and other files to develop applications with QScintilla for Qt
> Group: Development/KDE and Qt
>-Requires: %libqs4 = %{version}-%{release}
>+Requires: %libqs5 = %{version}-%{release}
> Provides: %{name}-qt5-devel = %{version}-%{release}
> Obsoletes: %{_lib}qscintilla-qt5_-devel
> Obsoletes: %{_lib}qscintilla-qt5-devel < 2.6-2
>@@ -90,11 +158,29 @@
> 
> %files -n %libqs5dev
> %{_qt5_includedir}/*
>-%{_qt5_libdir}/*.so
>+%{_qt5_libdir}/libqt5scintilla2.so
> %{_qt5_prefix}/mkspecs/features/qscintilla2.prf
> %{_qt5_plugindir}/designer/*
> 
> #--------------------------------------------------------------
>+
>+%package -n python-qt4-qscintilla
>+Summary: Python qt4 QScintilla bindings
>+Group: Development/KDE and Qt
>+Requires: python-qt4-core
>+Requires: python-qt4-gui
>+Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}
>+Requires: %libqs4 = %{version}
>+
>+%description -n python-qt4-qscintilla
>+Python qt4 QScintilla bindings.
>+
>+%files -n python-qt4-qscintilla 
>+%_datadir/sip/PyQt4
>+%_qt4_datadir/qsci
>+%py_platsitedir/PyQt4/Qsci.so
>+
>+#--------------------------------------------------------------
> %package -n python3-qt5-qscintilla
> Summary: Python qt5 QScintilla bindings
> Group: Development/KDE and Qt
>@@ -125,21 +211,47 @@
> 
> %prep 
> %setup -qn QScintilla-gpl-%{version}
>+%patch0 -p1
> %if %build_pyqt5
> cp -a . %{py3dir}
>+%else
>+cp -a Qt4Qt5 Qt4Qt5.orig
>+cp -a designer-Qt4Qt5 designer-Qt4Qt5.orig
> %endif
> 
> %build
>+pushd Qt4Qt5
>+    export QTDIR=%_qt4_datadir
>+    %qmake_qt4 DESTDIR=%buildroot/%{_qt4_libdir} qscintilla.pro
>+    %make
>+popd
>+
>+pushd designer-Qt4Qt5
>+    echo "INCLUDEPATH += ../Qt4Qt5" >> designer.pro
>+    echo "LIBS += -L%buildroot/%{_qt4_libdir} -lqscintilla2" >> designer.pro
>+    %qmake_qt4 designer.pro
>+    make
>+popd
>+
>+pushd Python
>+    export QTDIR=%_qt4_datadir
>+    export PATH=%_qt4_datadir/bin:$PATH
>+    python configure.py \
>+        -n ../Qt4Qt5 \
>+        -o %buildroot/%{_qt4_libdir}
>+    %make
>+popd
>+
> %if !%build_pyqt5
>-pushd Qt4Qt5
>+pushd Qt4Qt5.orig
>     export QTDIR=%_qt5_datadir
>     %qmake_qt5 DESTDIR=%buildroot/%{_qt5_libdir} qscintilla.pro
>     %make 
> popd
> 
>-pushd designer-Qt4Qt5
>-    echo "INCLUDEPATH += ../Qt4Qt5" >> designer.pro
>-    echo "LIBS += -L%buildroot/%{_qt5_libdir} -lqscintilla2" >> designer.pro
>+pushd designer-Qt4Qt5.orig
>+    echo "INCLUDEPATH += ../Qt4Qt5.orig" >> designer.pro
>+    echo "LIBS += -L%buildroot/%{_qt5_libdir} -lqt5scintilla2" >> designer.pro
>     %qmake_qt5 designer.pro
>     make
> popd
>@@ -153,7 +265,7 @@
> 
> pushd %{py3dir}/designer-Qt4Qt5
>     echo "INCLUDEPATH += ../Qt4Qt5" >> designer.pro
>-    echo "LIBS += -L%buildroot/%{_qt5_libdir} -lqscintilla2" >> designer.pro
>+    echo "LIBS += -L%buildroot/%{_qt5_libdir} -lqt5scintilla2" >> designer.pro
>     %qmake_qt5 designer.pro
>     make
> popd
>@@ -170,7 +282,6 @@
> %endif
> 
> %install
>-%if !%build_pyqt5
> pushd Qt4Qt5
>     make INSTALL_ROOT=%buildroot install
> popd
>@@ -179,6 +290,19 @@
>     make INSTALL_ROOT=%buildroot install
> popd
> 
>+pushd Python
>+    make INSTALL_ROOT=%buildroot install
>+popd
>+
>+%if !%build_pyqt5
>+pushd Qt4Qt5.orig
>+    make INSTALL_ROOT=%buildroot install
>+popd
>+
>+pushd designer-Qt4Qt5.orig
>+    make INSTALL_ROOT=%buildroot install
>+popd
>+
> %else
> pushd %{py3dir}/Qt4Qt5
>     make INSTALL_ROOT=%buildroot install

Index: qscintilla.spec
===================================================================
--- qscintilla.spec	(rÃ©vision 895805)
+++ qscintilla.spec	(copie de travail)
@@ -3,11 +3,16 @@
 Name:		qscintilla
 Summary:	Port to Qt of Neil Hodgson's Scintilla C++ editor class
 Version:	2.9
-Release:	%mkrel 4
+Release:	%mkrel 5
 License:	GPLv2+
 Group:		System/Libraries
 Source0:	http://downloads.sourceforge.net/pyqt/QScintilla-gpl-%{version}.tar.gz
+Patch0:		QScintilla-gpl-2.9-build-both-qt4-qt5.patch
 URL:		http://www.riverbankcomputing.co.uk/software/qscintilla/intro
+BuildRequires:	qt4-devel >= 4:4.3.1
+BuildRequires:	python-sip >= 1:4.12.0
+BuildRequires:	python-qt4-devel >= 4.10
+BuildRequires:	python-devel
 BuildRequires:	pkgconfig(Qt5Widgets)
 BuildRequires:	pkgconfig(Qt5PrintSupport)
 BuildRequires:	pkgconfig(Qt5Designer)
@@ -44,6 +49,26 @@
 Translations used by %{name}.
 
 %files i18n
+%{_qt4_translationdir}/qscintilla*.qm
+
+%package qt5-i18n
+Summary: Translations used by %{name}
+Group: System/Libraries
+BuildArch: noarch
+Obsoletes: qscintilla-translations
+Conflicts: libqscintilla-qt4_2
+Conflicts: lib64qscintilla-qt4_2
+Conflicts: libqscintilla2_7
+Conflicts: lib64qscintilla2_7
+Conflicts: libqscintilla2_8
+Conflicts: lib64qscintilla2_8
+Conflicts: libqscintilla2_9 < 2.7.2-2
+Conflicts: lib64qscintilla2_9 < 2.7.2-2
+
+%description qt5-i18n
+Translations used by %{name}.
+
+%files qt5-i18n
 %{_qt5_translationdir}/qscintilla*.qm
 
 #--------------------------------------------------------------
@@ -67,17 +92,60 @@
 multiple foreground and background colours and multiple fonts.
 
 %files -n %libqs4
-%{_qt5_libdir}/libqscintilla2.so.%{major}
-%{_qt5_libdir}/libqscintilla2.so.%{major}.*
+%{_qt4_libdir}/libqscintilla2.so.%{major}
+%{_qt4_libdir}/libqscintilla2.so.%{major}.*
 
+%define libqs5 %mklibname qt5scintilla2_ %{major}
+
+%package -n %libqs5
+Summary: Port to Qt of Neil Hodgson's Scintilla C++ editor class
+Group: System/Libraries
+Requires: %{name}-qt5-i18n
+
+%description -n %libqs5
+As well as features found in standard text editing components,
+QScintilla includes features especially useful when editing and
+debugging source code. These include support for syntax styling, error
+indicators, code completion and call tips. The selection margin can
+contain markers like those used in debuggers to indicate breakpoints
+and the current line. Styling choices are more open than with many
+editors, allowing the use of proportional fonts, bold and italics,
+multiple foreground and background colours and multiple fonts.
+
+%files -n %libqs5
+%{_qt5_libdir}/libqt5scintilla2.so.%{major}
+%{_qt5_libdir}/libqt5scintilla2.so.%{major}.*
+
 #--------------------------------------------------------------
 
-%define libqs5dev %mklibname -d qscintilla
+%define libqs4dev %mklibname -d qscintilla
 
+%package -n %libqs4dev
+Summary: Libraries, include and other files to develop applications with QScintilla for Qt
+Group: Development/KDE and Qt
+Requires: %libqs4 = %{version}-%{release}
+Provides: %{name}-qt4-devel = %{version}-%{release}
+Obsoletes: %{_lib}qscintilla-qt4_-devel
+Obsoletes: %{_lib}qscintilla-qt4-devel < 2.6-2
+Provides: qscintilla-qt4-devel = %{version}-%{release}
+Conflicts: %{_lib}qscintilla-qt3_2 <= 2.2-2
+
+%description -n %libqs4dev
+This packages contains the libraries, include and other files
+you can use to develop applications with QScintilla.
+
+%files -n %libqs4dev
+%{_qt4_includedir}/*
+%{_qt4_libdir}/libqscintilla2.so
+%{_qt4_prefix}/mkspecs/features/qscintilla2.prf
+%{_qt4_plugindir}/designer/*
+
+%define libqs5dev %mklibname -d qt5scintilla
+
 %package -n %libqs5dev
 Summary: Libraries, include and other files to develop applications with QScintilla for Qt
 Group: Development/KDE and Qt
-Requires: %libqs4 = %{version}-%{release}
+Requires: %libqs5 = %{version}-%{release}
 Provides: %{name}-qt5-devel = %{version}-%{release}
 Obsoletes: %{_lib}qscintilla-qt5_-devel
 Obsoletes: %{_lib}qscintilla-qt5-devel < 2.6-2
@@ -90,11 +158,29 @@
 
 %files -n %libqs5dev
 %{_qt5_includedir}/*
-%{_qt5_libdir}/*.so
+%{_qt5_libdir}/libqt5scintilla2.so
 %{_qt5_prefix}/mkspecs/features/qscintilla2.prf
 %{_qt5_plugindir}/designer/*
 
 #--------------------------------------------------------------
+
+%package -n python-qt4-qscintilla
+Summary: Python qt4 QScintilla bindings
+Group: Development/KDE and Qt
+Requires: python-qt4-core
+Requires: python-qt4-gui
+Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}
+Requires: %libqs4 = %{version}
+
+%description -n python-qt4-qscintilla
+Python qt4 QScintilla bindings.
+
+%files -n python-qt4-qscintilla 
+%_datadir/sip/PyQt4
+%_qt4_datadir/qsci
+%py_platsitedir/PyQt4/Qsci.so
+
+#--------------------------------------------------------------
 %package -n python3-qt5-qscintilla
 Summary: Python qt5 QScintilla bindings
 Group: Development/KDE and Qt
@@ -125,21 +211,47 @@
 
 %prep 
 %setup -qn QScintilla-gpl-%{version}
+%patch0 -p1
 %if %build_pyqt5
 cp -a . %{py3dir}
+%else
+cp -a Qt4Qt5 Qt4Qt5.orig
+cp -a designer-Qt4Qt5 designer-Qt4Qt5.orig
 %endif
 
 %build
+pushd Qt4Qt5
+    export QTDIR=%_qt4_datadir
+    %qmake_qt4 DESTDIR=%buildroot/%{_qt4_libdir} qscintilla.pro
+    %make
+popd
+
+pushd designer-Qt4Qt5
+    echo "INCLUDEPATH += ../Qt4Qt5" >> designer.pro
+    echo "LIBS += -L%buildroot/%{_qt4_libdir} -lqscintilla2" >> designer.pro
+    %qmake_qt4 designer.pro
+    make
+popd
+
+pushd Python
+    export QTDIR=%_qt4_datadir
+    export PATH=%_qt4_datadir/bin:$PATH
+    python configure.py \
+        -n ../Qt4Qt5 \
+        -o %buildroot/%{_qt4_libdir}
+    %make
+popd
+
 %if !%build_pyqt5
-pushd Qt4Qt5
+pushd Qt4Qt5.orig
     export QTDIR=%_qt5_datadir
     %qmake_qt5 DESTDIR=%buildroot/%{_qt5_libdir} qscintilla.pro
     %make 
 popd
 
-pushd designer-Qt4Qt5
-    echo "INCLUDEPATH += ../Qt4Qt5" >> designer.pro
-    echo "LIBS += -L%buildroot/%{_qt5_libdir} -lqscintilla2" >> designer.pro
+pushd designer-Qt4Qt5.orig
+    echo "INCLUDEPATH += ../Qt4Qt5.orig" >> designer.pro
+    echo "LIBS += -L%buildroot/%{_qt5_libdir} -lqt5scintilla2" >> designer.pro
     %qmake_qt5 designer.pro
     make
 popd
@@ -153,7 +265,7 @@
 
 pushd %{py3dir}/designer-Qt4Qt5
     echo "INCLUDEPATH += ../Qt4Qt5" >> designer.pro
-    echo "LIBS += -L%buildroot/%{_qt5_libdir} -lqscintilla2" >> designer.pro
+    echo "LIBS += -L%buildroot/%{_qt5_libdir} -lqt5scintilla2" >> designer.pro
     %qmake_qt5 designer.pro
     make
 popd
@@ -170,7 +282,6 @@
 %endif
 
 %install
-%if !%build_pyqt5
 pushd Qt4Qt5
     make INSTALL_ROOT=%buildroot install
 popd
@@ -179,6 +290,19 @@
     make INSTALL_ROOT=%buildroot install
 popd
 
+pushd Python
+    make INSTALL_ROOT=%buildroot install
+popd
+
+%if !%build_pyqt5
+pushd Qt4Qt5.orig
+    make INSTALL_ROOT=%buildroot install
+popd
+
+pushd designer-Qt4Qt5.orig
+    make INSTALL_ROOT=%buildroot install
+popd
+
 %else
 pushd %{py3dir}/Qt4Qt5
     make INSTALL_ROOT=%buildroot install

Actions: View | Diff

Attachments on bug 17039: 7173 | 7174 | 7192