rdieter pushed to qscintilla (master). "2.9-3 (..more)"

[notifications at fedoraproject.org]

>From 588f80122dd4c012b11e224c42e2e4954d436e1a Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 26 Apr 2015 13:31:10 -0500
Subject: 2.9-3

- use %qmake_qt4 macroo
- Qt5 qscintilla2.prf is installed in bad location (#1215380)

diff --git a/QScintilla-gpl-2.9-qt5.patch b/QScintilla-gpl-2.9-qt5.patch
index 61ca5ce..56ba60f 100644
--- a/QScintilla-gpl-2.9-qt5.patch
+++ b/QScintilla-gpl-2.9-qt5.patch
@@ -1,6 +1,6 @@
 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
++++ QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf	2015-04-26 12:54:53.478359373 -0500
 @@ -17,9 +17,17 @@ CONFIG(debug, debug|release) {
          win32: {
              LIBS += -lqscintilla2d
@@ -20,8 +20,8 @@ diff -up QScintilla-gpl-2.9/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla-gpl-2
  }
 +}
 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
+--- QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro.qt5	2015-04-20 09:38:24.000000000 -0500
++++ QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro	2015-04-26 13:07:36.261581948 -0500
 @@ -23,7 +23,11 @@
  !win32:VERSION = 12.0.0
  
@@ -34,3 +34,15 @@ diff -up QScintilla-gpl-2.9/Qt4Qt5/qscintilla.pro.qt5 QScintilla-gpl-2.9/Qt4Qt5/
  CONFIG += qt warn_off release thread exceptions
  INCLUDEPATH += . ../include ../lexlib ../src
  
+@@ -77,7 +81,11 @@ isEmpty(qsci.path) {
+ INSTALLS += header trans qsci target
+ 
+ greaterThan(QT_MAJOR_VERSION, 3) {
++greaterThan(QT_MAJOR_VERSION, 4) {
++    features.path = $$[QT_HOST_DATA]/mkspecs/features
++} else {
+     features.path = $$[QT_INSTALL_DATA]/mkspecs/features
++}
+     features.files = $$PWD/features/qscintilla2.prf
+     INSTALLS += features
+ }
diff --git a/qscintilla.spec b/qscintilla.spec
index d2474dc..03e385c 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -11,7 +11,7 @@
 Summary: A Scintilla port to Qt
 Name:    qscintilla
 Version: 2.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Url:     http://www.riverbankcomputing.com/software/qscintilla/
@@ -125,7 +125,7 @@ BuildArch: noarch
 
 
 %prep
-%setup -n QScintilla-gpl-%{version}%{?snap:-snapshot-%{snap}}
+%setup -q -n QScintilla-gpl-%{version}%{?snap:-snapshot-%{snap}}
 
 %patch1 -p1 -b .qt5
 
@@ -135,14 +135,14 @@ PATH=%{_qt4_bindir}:$PATH; export PATH
 
 cp -a Qt4Qt5 Qt4/
 pushd Qt4
-%{_qt4_qmake} qscintilla.pro
+%{qmake_qt4} qscintilla.pro
 make %{?_smp_mflags}
 popd
 
 cp -a designer-Qt4Qt5 designer-Qt4/
 pushd designer-Qt4
 QMAKEFEATURES=../Qt4/features \
-%{_qt4_qmake} designer.pro INCLUDEPATH+=../Qt4 LIBS+=-L../Qt4
+%{qmake_qt4} designer.pro INCLUDEPATH+=../Qt4 LIBS+=-L../Qt4
 make %{?_smp_mflags}
 popd
 
@@ -295,7 +295,7 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 %doc doc/html-Qt4Qt5 doc/Scintilla example-Qt4Qt5
 %{_qt5_headerdir}/Qsci/
 %{_qt5_libdir}/libqscintilla2-qt5.so
-%{_qt5_datadir}/mkspecs/features/qscintilla2.prf
+%{_qt5_archdatadir}/mkspecs/features/qscintilla2.prf
 
 %if 0%{?python3}
 %files -n python3-qscintilla-qt5
@@ -309,6 +309,11 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 
 
 %changelog
+* Sun Apr 26 2015 Rex Dieter <rdieter at fedoraproject.org> 
+- 2.9-3
+- use %%qmake_qt4 macroo
+- Qt5 qscintilla2.prf is installed in bad location (#1215380)
+
 * Thu Apr 23 2015 Rex Dieter <rdieter at fedoraproject.org> 2.9-2
 - Provides: bundled(scintilla) = 3.5.4
 
-- 
cgit v0.10.2


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