From 0f497c450e041bfbe4a376ee147bdfafa9aefa9e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 18 2016 13:29:32 +0000 Subject: qscintilla-2.9.2 --- diff --git a/.gitignore b/.gitignore index 73e98e1..28f704d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/QScintilla-gpl-2.8.4.tar.gz -/QScintilla-gpl-2.9.1.tar.gz +/QScintilla_gpl-2.9.2.tar.gz diff --git a/QScintilla-gpl-2.9.1-qt5.patch b/QScintilla-gpl-2.9.1-qt5.patch deleted file mode 100644 index 363d86e..0000000 --- a/QScintilla-gpl-2.9.1-qt5.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up QScintilla-gpl-2.9.1/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla-gpl-2.9.1/Qt4Qt5/features/qscintilla2.prf ---- QScintilla-gpl-2.9.1/Qt4Qt5/features/qscintilla2.prf.qt5 2015-10-24 08:00:37.000000000 -0500 -+++ QScintilla-gpl-2.9.1/Qt4Qt5/features/qscintilla2.prf 2015-10-24 10:44:02.960900703 -0500 -@@ -17,9 +17,17 @@ CONFIG(debug, debug|release) { - win32: { - LIBS += -lqscintilla2d - } else { -+ greaterThan(QT_MAJOR_VERSION, 4) { -+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION} -+ } else { - LIBS += -lqscintilla2 - } -+ } - } - } else { -+greaterThan(QT_MAJOR_VERSION, 4) { -+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION} -+} else { - LIBS += -lqscintilla2 - } -+} -diff -up QScintilla-gpl-2.9.1/Qt4Qt5/qscintilla.pro.qt5 QScintilla-gpl-2.9.1/Qt4Qt5/qscintilla.pro ---- QScintilla-gpl-2.9.1/Qt4Qt5/qscintilla.pro.qt5 2015-10-24 10:44:02.961900732 -0500 -+++ QScintilla-gpl-2.9.1/Qt4Qt5/qscintilla.pro 2015-10-24 10:45:16.445068859 -0500 -@@ -23,7 +23,12 @@ - !win32:VERSION = 12.0.1 - - TEMPLATE = lib -+greaterThan(QT_MAJOR_VERSION, 4) { -+TARGET = qscintilla2-qt$${QT_MAJOR_VERSION} -+} else { - TARGET = qscintilla2 -+} -+ - CONFIG += qt warn_off release thread exceptions - INCLUDEPATH += . ../include ../lexlib ../src - diff --git a/QScintilla_gpl-2.9.2-qt5.patch b/QScintilla_gpl-2.9.2-qt5.patch new file mode 100644 index 0000000..da41e22 --- /dev/null +++ b/QScintilla_gpl-2.9.2-qt5.patch @@ -0,0 +1,36 @@ +diff -up QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf +--- QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 2016-04-18 04:08:48.000000000 -0500 ++++ QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf 2016-04-18 08:13:23.935665305 -0500 +@@ -19,9 +19,17 @@ CONFIG(debug, debug|release) { + win32: { + LIBS += -lqscintilla2d + } else { ++ greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION} ++ } else { + LIBS += -lqscintilla2 + } ++ } + } + } else { ++greaterThan(QT_MAJOR_VERSION, 4) { ++ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION} ++} else { + LIBS += -lqscintilla2 + } ++} +diff -up QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro +--- QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 2016-04-18 08:13:23.951665381 -0500 ++++ QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro 2016-04-18 08:14:20.807934597 -0500 +@@ -23,7 +23,11 @@ + !win32:VERSION = 12.0.1 + + TEMPLATE = lib ++greaterThan(QT_MAJOR_VERSION, 4) { ++TARGET = qscintilla2-qt$${QT_MAJOR_VERSION} ++} else { + TARGET = qscintilla2 ++} + CONFIG += qt warn_off release thread exceptions hide_symbols + INCLUDEPATH += . ../include ../lexlib ../src + diff --git a/qscintilla.spec b/qscintilla.spec index bce611b..f524f5e 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -3,26 +3,26 @@ # bootstrapping -python # undef python macros if you'd like to build qscintilla sans -python subpkg (which requires PyQt4) -%global python 1 +%global python2 1 %global python3 1 %global qt5 1 Summary: A Scintilla port to Qt Name: qscintilla -Version: 2.9.1 -Release: 6%{?dist} +Version: 2.9.2 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/qscintilla/ %if 0%{?snap:1} -Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}-snapshot-%{snap}.tar.gz +Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla_gpl-%{version}-snapshot-%{snap}.tar.gz %else -Source0: http://downloads.sf.net/pyqt/QScintilla-gpl-%{version}.tar.gz +Source0: http://downloads.sf.net/pyqt/QScintilla_gpl-%{version}.tar.gz %endif ## Upstreamable patches # make qt5 build parallel-installable -Patch2: QScintilla-gpl-2.9.1-qt5.patch +Patch2: QScintilla_gpl-2.9.2-qt5.patch BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml) %if 0%{?qt5} @@ -43,7 +43,7 @@ Requires: qt4-devel %description devel %{summary}. -%if 0%{?python} +%if 0%{?python2} %package python Summary: QScintilla python bindings BuildRequires: PyQt4-devel @@ -126,7 +126,7 @@ BuildArch: noarch %prep -%setup -q -n QScintilla-gpl-%{version}%{?snap:-snapshot-%{snap}} +%setup -q -n QScintilla_gpl-%{version}%{?snap:-snapshot-%{snap}} %patch2 -p1 -b .qt5 @@ -149,7 +149,7 @@ pushd designer-Qt4 make %{?_smp_mflags} popd -%if 0%{?python} +%if 0%{?python2} cp -a Python Python2-qt4 pushd Python2-qt4 %{__python2} \ @@ -214,7 +214,7 @@ popd %install make -C Qt4 install INSTALL_ROOT=%{buildroot} make -C designer-Qt4 install INSTALL_ROOT=%{buildroot} -%if 0%{?python} +%if 0%{?python2} make -C Python2-qt4 install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot} test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so || \ chmod a+x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so @@ -239,17 +239,22 @@ chmod a+x %{buildroot}%{python3_sitearch}/PyQt5/Qsci.so grep "%{_qt4_translationdir}" qscintilla.lang > qscintilla-qt4.lang grep "%{_qt5_translationdir}" qscintilla.lang > qscintilla-qt5.lang -%if !0%{?python} && !0%{?python3} # unpackaged files +%if !0%{?python2} rm -rfv %{buildroot}%{_qt4_datadir}/qsci/ %endif +%if !0%{?python3} +rm -rfv %{buildroot}%{_qt5_datadir}/qsci/ +%endif %check # verify python module(s) permissions and libqscintilla2 linkage # https://bugzilla.redhat.com/show_bug.cgi?id=1104559 +%if 0%{?python2} ldd %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so | grep libqscintilla2 || exit 1 test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so +%endif %if 0%{?python3} ldd %{buildroot}%{python3_sitearch}/PyQt4/Qsci.so | grep libqscintilla2 || exit 1 test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so @@ -271,7 +276,7 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so %{_qt4_libdir}/libqscintilla2.so %{_qt4_datadir}/mkspecs/features/qscintilla2.prf -%if 0%{?python} +%if 0%{?python2} %files python %{python2_sitearch}/PyQt4/Qsci.so %{_qt4_datadir}/qsci/ @@ -314,6 +319,9 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so %changelog +* Mon Apr 18 2016 Rex Dieter - 2.9.2-1 +- qscintilla-2.9.2 + * Wed Apr 13 2016 Rex Dieter - 2.9.1-6 - rebuild (sip), Provides: python2-qscintilla(-devel) diff --git a/sources b/sources index db5ff9c..bb380d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38e6248cb970adf6d05aea7d94f1288e QScintilla-gpl-2.9.1.tar.gz +db260651a5e086cc4eee6417172e27e8 QScintilla_gpl-2.9.2.tar.gz