[qscintilla] rebuild (PyQt4), refresh incpath patch

[Rex Dieter]

commit 545c536bb814dff73db3a061bccee94878f0f520
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Oct 16 16:40:25 2013 -0500

    rebuild (PyQt4), refresh incpath patch

 QScintilla-gpl-2.7.1-qt4qt5_designer_incpath.patch |   11 -----------
 ...lla-gpl-2.7.2-designer-Qt4Qt5_INCLUDEPATH.patch |   11 +++++++++++
 qscintilla.spec                                    |    9 ++++++---
 3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/QScintilla-gpl-2.7.2-designer-Qt4Qt5_INCLUDEPATH.patch b/QScintilla-gpl-2.7.2-designer-Qt4Qt5_INCLUDEPATH.patch
new file mode 100644
index 0000000..de0ce80
--- /dev/null
+++ b/QScintilla-gpl-2.7.2-designer-Qt4Qt5_INCLUDEPATH.patch
@@ -0,0 +1,11 @@
+diff -up QScintilla-gpl-2.7.2/designer-Qt4Qt5/designer.pro.qt4_designer_incpath QScintilla-gpl-2.7.2/designer-Qt4Qt5/designer.pro
+--- QScintilla-gpl-2.7.2/designer-Qt4Qt5/designer.pro.qt4_designer_incpath	2012-12-21 11:30:31.000000000 -0600
++++ QScintilla-gpl-2.7.2/designer-Qt4Qt5/designer.pro	2013-10-16 09:22:49.963169571 -0500
+@@ -22,4 +22,6 @@ SOURCES = qscintillaplugin.cpp
+ target.path = $$[QT_INSTALL_PLUGINS]/designer
+ INSTALLS += target
+ 
+-LIBS += -L$$[QT_INSTALL_LIBS] -lqscintilla2
++LIBS += -L$(DESTDIR)../Qt4Qt5 -L$$[QT_INSTALL_LIBS] -lqscintilla2
++
++INCLUDEPATH = $(DESTDIR)../Qt4Qt5
diff --git a/qscintilla.spec b/qscintilla.spec
index e785a92..a2c1788 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -6,7 +6,7 @@
 
 Name:    qscintilla
 Version: 2.7.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A Scintilla port to Qt
 
 # matches up (pretty much) with qt4
@@ -15,7 +15,7 @@ Url:     http://www.riverbankcomputing.com/software/qscintilla/
 Source0: http://downloads.sf.net/pyqt/QScintilla-gpl-%{version}.tar.gz
 
 ## Upstreamable patches
-Patch50: QScintilla-gpl-2.7.1-qt4qt5_designer_incpath.patch
+Patch50: QScintilla-gpl-2.7.2-designer-Qt4Qt5_INCLUDEPATH.patch
 Patch51: QScintilla-gpl-2.7.2-api_path.patch
 
 BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml)
@@ -57,7 +57,7 @@ BuildArch: noarch
 %prep
 %setup -q -n QScintilla-gpl-%{version}
 
-%patch50 -p1 -b .qt4_designer_incpath
+%patch50 -p1 -b .designer-Qt4Qt5_INCLUDEPATH
 %patch51 -p1 -b .api_path
 
 # fix line endings in license file(s)
@@ -129,6 +129,9 @@ rm -rf %{buildroot}%{_qt4_datadir}/qsci/
 
 
 %changelog
+* Wed Oct 16 2013 Rex Dieter <rdieter at fedoraproject.org> 2.7.2-3
+- rebuild (PyQt4), refresh incpath patch
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild