[qscintilla] 2.7.1

[Rex Dieter]

commit 7eb527f615b2138237307d4a5001d71ba2357989
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Mar 3 18:22:17 2013 -0600

    2.7.1

 .gitignore                                         |    4 +---
 QScintilla-gpl-2.6.2-qt4qt5_designer_incpath.patch |   11 -----------
 QScintilla-gpl-2.7.1-qt4qt5_designer_incpath.patch |   11 +++++++++++
 qscintilla.spec                                    |   10 ++++++----
 sources                                            |    2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b443dad..8a58b64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/QScintilla-gpl-2.5.1.tar.gz
-/QScintilla-gpl-2.6.2.tar.gz
-/QScintilla-gpl-2.7.tar.gz
+/QScintilla-gpl-2.7.1.tar.gz
diff --git a/QScintilla-gpl-2.7.1-qt4qt5_designer_incpath.patch b/QScintilla-gpl-2.7.1-qt4qt5_designer_incpath.patch
new file mode 100644
index 0000000..611ba46
--- /dev/null
+++ b/QScintilla-gpl-2.7.1-qt4qt5_designer_incpath.patch
@@ -0,0 +1,11 @@
+diff -up QScintilla-gpl-2.7.1/designer-Qt4Qt5/designer.pro.qt4qt5_designer_incpath QScintilla-gpl-2.7.1/designer-Qt4Qt5/designer.pro
+--- QScintilla-gpl-2.7.1/designer-Qt4Qt5/designer.pro.qt4qt5_designer_incpath	2012-12-21 11:30:31.000000000 -0600
++++ QScintilla-gpl-2.7.1/designer-Qt4Qt5/designer.pro	2013-03-03 18:21:11.466370720 -0600
+@@ -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
++
++INCPATH = $(DESTDIR)../Qt4Qt5
diff --git a/qscintilla.spec b/qscintilla.spec
index 3ef5ece..3532386 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -5,8 +5,8 @@
 %global python 1
 
 Name:    qscintilla
-Version: 2.7
-Release: 2%{?dist}
+Version: 2.7.1
+Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 
 # matches up (pretty much) with qt4
@@ -15,8 +15,7 @@ Url:     http://www.riverbankcomputing.com/software/qscintilla/
 Source0: http://downloads.sf.net/pyqt/QScintilla-gpl-%{version}.tar.gz
 
 ## Upstreamable patches
-# posted to upstream ml, not in archive yet
-Patch50: QScintilla-gpl-2.6.2-qt4qt5_designer_incpath.patch
+Patch50: QScintilla-gpl-2.7.1-qt4qt5_designer_incpath.patch
 
 BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml)
 
@@ -121,6 +120,9 @@ make -C Python install DESTDIR=%{buildroot}
 
 
 %changelog
+* Sun Mar 03 2013 Rex Dieter <rdieter at fedoraproject.org> 2.7.1-1
+- 2.7.1
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 2557a77..902ec23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3857d75a2b332e0460131e0aa4cc4b5  QScintilla-gpl-2.7.tar.gz
+da8939b5679a075e30c6632e54dc5abf  QScintilla-gpl-2.7.1.tar.gz