diff --git a/.gitignore b/.gitignore index 28f704d..b8d10e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/QScintilla_gpl-2.9.2.tar.gz +/QScintilla_gpl-2.9.3.tar.gz diff --git a/QScintilla_gpl-2.9.2-qt5.patch b/QScintilla_gpl-2.9.2-qt5.patch deleted file mode 100644 index da41e22..0000000 --- a/QScintilla_gpl-2.9.2-qt5.patch +++ /dev/null @@ -1,36 +0,0 @@ -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_gpl-2.9.3-qt5.patch b/QScintilla_gpl-2.9.3-qt5.patch new file mode 100644 index 0000000..ee53c2c --- /dev/null +++ b/QScintilla_gpl-2.9.3-qt5.patch @@ -0,0 +1,36 @@ +diff -up QScintilla_gpl-2.9.3/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.3/Qt4Qt5/features/qscintilla2.prf +--- QScintilla_gpl-2.9.3/Qt4Qt5/features/qscintilla2.prf.qt5 2016-07-25 09:13:58.000000000 -0500 ++++ QScintilla_gpl-2.9.3/Qt4Qt5/features/qscintilla2.prf 2016-07-26 10:59:37.053148135 -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.3/Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.3/Qt4Qt5/qscintilla.pro +--- QScintilla_gpl-2.9.3/Qt4Qt5/qscintilla.pro.qt5 2016-07-26 10:59:37.054148143 -0500 ++++ QScintilla_gpl-2.9.3/Qt4Qt5/qscintilla.pro 2016-07-26 11:35:32.554370719 -0500 +@@ -23,7 +23,11 @@ + !win32:VERSION = 12.0.2 + + 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 a8ba120..71d82e6 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -12,8 +12,8 @@ Summary: A Scintilla port to Qt Name: qscintilla -Version: 2.9.2 -Release: 5%{?dist} +Version: 2.9.3 +Release: 1%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/qscintilla/ @@ -25,7 +25,7 @@ Source0: http://downloads.sf.net/pyqt/QScintilla_gpl-%{version}.tar.gz ## Upstreamable patches # make qt5 build parallel-installable -Patch2: QScintilla_gpl-2.9.2-qt5.patch +Patch2: QScintilla_gpl-2.9.3-qt5.patch BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml) %if 0%{?qt5} @@ -161,7 +161,6 @@ cp -a Python Python2-qt4 pushd Python2-qt4 %{__python2} \ configure.py \ - --no-timestamp \ --qsci-incdir=../Qt4 --qsci-libdir=../Qt4 make %{?_smp_mflags} @@ -173,7 +172,6 @@ cp -a Python Python3-qt4 pushd Python3-qt4 %{__python3} \ configure.py \ - --no-timestamp \ --pyqt-sipdir=/usr/share/python3-sip/PyQt4 \ --qsci-incdir=../Qt4 --qsci-libdir=../Qt4 \ --sip=/usr/bin/python3-sip @@ -326,6 +324,9 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so %changelog +* Tue Jul 26 2016 Rex Dieter - 2.9.3-1 +- qscintilla-2.9.3 + * Tue Jul 19 2016 Fedora Release Engineering - 2.9.2-5 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index bb380d4..32d4f69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db260651a5e086cc4eee6417172e27e8 QScintilla_gpl-2.9.2.tar.gz +3b1cdbce9ef6c28cd868bcc58219f96e QScintilla_gpl-2.9.3.tar.gz