[qscintilla] 2.6.2

[Rex Dieter]

commit 52f13d68921a5857c8abcfddec7e7e798f3d15fa
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jun 22 21:22:52 2012 -0500

    2.6.2

 .gitignore                                         |    2 +-
 QScintilla-gpl-2.4-qt4_designer_incpath.patch      |   11 ----------
 QScintilla-gpl-2.6.2-qt4qt5_designer_incpath.patch |   11 ++++++++++
 qscintilla.spec                                    |   22 ++++++++++----------
 sources                                            |    2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f0b72d..fea3e47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/QScintilla-gpl-2.4.6.tar.gz
 /QScintilla-gpl-2.5.1.tar.gz
 /QScintilla-gpl-2.6.1.tar.gz
+/QScintilla-gpl-2.6.2.tar.gz
diff --git a/QScintilla-gpl-2.6.2-qt4qt5_designer_incpath.patch b/QScintilla-gpl-2.6.2-qt4qt5_designer_incpath.patch
new file mode 100644
index 0000000..dad7b9a
--- /dev/null
+++ b/QScintilla-gpl-2.6.2-qt4qt5_designer_incpath.patch
@@ -0,0 +1,11 @@
+diff -up QScintilla-gpl-2.6.2/designer-Qt4/designer.pro.qt4_designer_incpath QScintilla-gpl-2.6.2/designer-Qt4/designer.pro
+--- QScintilla-gpl-2.6.2/designer-Qt4/designer.pro.qt4_designer_incpath	2011-06-13 07:16:23.000000000 -0500
++++ QScintilla-gpl-2.6.2/designer-Qt4/designer.pro	2012-06-22 21:12:17.932782713 -0500
+@@ -12,4 +12,6 @@ SOURCES = qscintillaplugin.cpp
+ target.path = $$[QT_INSTALL_PLUGINS]/designer
+ INSTALLS += target
+ 
+-LIBS += -lqscintilla2
++LIBS += -L$(DESTDIR)../Qt4Qt5 -lqscintilla2
++
++INCPATH = $(DESTDIR)../Qt4Qt5
diff --git a/qscintilla.spec b/qscintilla.spec
index 4a02ae9..c38ffed 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -5,9 +5,10 @@
 %global python 1
 
 Name:    qscintilla
-Version: 2.6.1
+Version: 2.6.2
 Release: 1%{?dist}
 Summary: A Scintilla port to Qt
+
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
 Group:   Development/Tools
@@ -17,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## Upstreamable patches
 # posted to upstream ml, not in archive yet
-Patch50: QScintilla-gpl-2.4-qt4_designer_incpath.patch 
+Patch50: QScintilla-gpl-2.6.2-qt4qt5_designer_incpath.patch
 
 Obsoletes: qscintilla-designer < 2.4-3
 Provides:  qscintilla-designer = %{version}-%{release}
@@ -76,16 +77,12 @@ Obsoletes: qscintilla-python-devel < 2.4-4
 
 %patch50 -p1 -b .qt4_designer_incpath
 
-# fix permissions on doc files
-find doc example-Qt4  -type f -exec chmod 0644 {} ';'
-find src include -type f -exec chmod 0644 {} ';'
-
 # fix line endings in license file(s)
 sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTION_ADDENDUM.TXT
 
 
 %build
-pushd Qt4
+pushd Qt4Qt5
 %{_qt4_qmake} qscintilla.pro
 make %{?_smp_mflags}
 popd
@@ -100,8 +97,8 @@ pushd Python
 %{__python} \
   configure.py \
     -c -j 3 \
-    -n ../Qt4 \
-    -o ../Qt4
+    -n ../Qt4Qt5 \
+    -o ../Qt4Qt5
 make %{?_smp_mflags}
 popd
 %endif
@@ -110,7 +107,7 @@ popd
 %install
 rm -rf %{buildroot}
 
-make -C Qt4 install INSTALL_ROOT=%{buildroot} 
+make -C Qt4Qt5 install INSTALL_ROOT=%{buildroot} 
 make -C designer-Qt4 install INSTALL_ROOT=%{buildroot}
 %if 0%{?python}
 make -C Python install DESTDIR=%{buildroot}
@@ -136,7 +133,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%doc doc/html-Qt4 doc/Scintilla example-Qt4
+%doc doc/html-Qt4Qt5 doc/Scintilla example-Qt4Qt5
 %{_qt4_headerdir}/Qsci/
 %{_qt4_libdir}/libqscintilla2.so
 
@@ -152,6 +149,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jun 22 2012 Rex Dieter <rdieter at fedoraproject.org> 2.6.2-1
+- 2.6.2
+
 * Sat Feb 11 2012 Rex Dieter <rdieter at fedoraproject.org> 2.6.1-1
 - 2.6.1
 - pkgconfig-style deps
diff --git a/sources b/sources
index 2f33e31..c981559 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-39a1d0567a20b416177eb1a8afe225a7  QScintilla-gpl-2.6.1.tar.gz
+6e6641b6f3863c01cc28c2d7bd2495f9  QScintilla-gpl-2.6.2.tar.gz