rdieter pushed to qscintilla (master). "2.9"

Tue Apr 21 01:15:08 UTC 2015

>From e5c5b647006ab0a480c6f834ce030fa9998a78cd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Mon, 20 Apr 2015 20:14:58 -0500
Subject: 2.9

diff --git a/QScintilla-gpl-2.8.4-qt5.patch b/QScintilla-gpl-2.8.4-qt5.patch
deleted file mode 100644
index dcedbbc..0000000
--- a/QScintilla-gpl-2.8.4-qt5.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf
---- QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf.qt5	2014-09-11 12:15:15.000000000 -0500
-+++ QScintilla-gpl-2.8.4/Qt4Qt5/features/qscintilla2.prf	2014-12-28 21:55:24.721885699 -0600
-@@ -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.8.4/Qt4Qt5/qscintilla.pro.qt5 QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro
---- QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro.qt5	2014-09-11 12:15:15.000000000 -0500
-+++ QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro	2014-12-28 21:13:49.164135542 -0600
-@@ -28,7 +28,11 @@
- !win32:VERSION = 11.3.0
- 
- 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-qt5.patch b/QScintilla-gpl-2.9-qt5.patch
new file mode 100644
index 0000000..61ca5ce
--- /dev/null
+++ b/QScintilla-gpl-2.9-qt5.patch
@@ -0,0 +1,36 @@
+diff -up QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf
+--- QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf.qt5	2015-04-20 09:38:24.000000000 -0500
++++ QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf	2015-04-20 18:39:10.215614625 -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/Qt4Qt5/qscintilla.pro.qt5 QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro
+--- QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro.qt5	2015-04-20 18:39:10.215614625 -0500
++++ QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro	2015-04-20 18:40:39.228015798 -0500
+@@ -23,7 +23,11 @@
+ !win32:VERSION = 12.0.0
+ 
+ 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.spec b/qscintilla.spec
index 71fc1c9..6af71ac 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -1,5 +1,5 @@
 
-%global scintilla_ver 3.3.6
+%global scintilla_ver 3.5.4
 
 # bootstrapping -python
 # undef python macros if you'd like to build qscintilla sans -python subpkg (which requires PyQt4)
@@ -10,11 +10,10 @@
 
 Summary: A Scintilla port to Qt
 Name:    qscintilla
-Version: 2.8.4
-Release: 3%{?dist}
+Version: 2.9
+Release: 1%{?dist}
 
-# matches up (pretty much) with qt4
-License: GPLv3 or GPLv2 with exceptions
+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
@@ -24,7 +23,7 @@ Source0: http://downloads.sf.net/pyqt/QScintilla-gpl-%{version}.tar.gz
 
 ## Upstreamable patches
 # make qt5 build parallel-installable
-Patch1: QScintilla-gpl-2.8.4-qt5.patch
+Patch1: QScintilla-gpl-2.9-qt5.patch
 
 BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml)
 %if 0%{?qt5}
@@ -229,6 +228,10 @@ chmod a+x %{buildroot}%{python3_sitearch}/PyQt5/Qsci.so
 %endif
 %endif
 
+%find_lang qscintilla --with-qt
+grep "%{_qt4_translationdir}" qscintilla.lang > qscintilla-qt4.lang
+grep "%{_qt5_translationdir}" qscintilla.lang > qscintilla-qt5.lang
+
 %if !0%{?python} && !0%{?python3}
 # unpackaged files
 rm -rfv %{buildroot}%{_qt4_datadir}/qsci/
@@ -249,13 +252,11 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%files
+%files -f qscintilla-qt4.lang
 %doc NEWS README
-%doc LICENSE.GPL3 LICENSE.GPL2
-%doc GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{_qt4_libdir}/libqscintilla2.so.11*
+%license LICENSE
+%{_qt4_libdir}/libqscintilla2.so.12*
 %{_qt4_plugindir}/designer/libqscintillaplugin.so
-%{_qt4_translationdir}/*
 
 %files devel
 %doc doc/html-Qt4Qt5 doc/Scintilla example-Qt4Qt5
@@ -282,13 +283,11 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 %endif
 
 %if 0%{?qt5}
-%files qt5
+%files qt5 -f qscintilla-qt5.lang
 %doc NEWS README
-%doc LICENSE.GPL3 LICENSE.GPL2
-%doc GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{_qt5_libdir}/libqscintilla2-qt5.so.11*
+%license LICENSE
+%{_qt5_libdir}/libqscintilla2-qt5.so.12*
 %{_qt5_plugindir}/designer/libqscintillaplugin.so
-%{_qt5_translationdir}/*
 
 %files qt5-devel
 %doc doc/html-Qt4Qt5 doc/Scintilla example-Qt4Qt5
@@ -308,6 +307,9 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 
 
 %changelog
+* Mon Apr 20 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9-1
+- 2.9
+
 * Wed Feb 18 2015 Orion Poplawski <orion at cora.nwra.com> - 2.8.4-3
 - Rebuild for gcc 5 C++11
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qscintilla.git/commit/?h=master&id=e5c5b647006ab0a480c6f834ce030fa9998a78cd
