[texstudio/f20] Update to 2.6.6

[hannes]

commit ccd6cf086be1c73951af7898c322891a04d9d8c2
Author: hannes <hannes at fedoraproject.org>
Date:   Mon Nov 4 20:51:30 2013 +0100

    Update to 2.6.6

 ...se-system-hunspell-instead-of-bundled-one.patch |   40 ++++++++++----------
 ...qtsingleapplication-instead-of-bundled-on.patch |   25 ++++++------
 texstudio.spec                                     |    7 ++-
 3 files changed, 37 insertions(+), 35 deletions(-)
---
diff --git a/texstudio-use-system-hunspell-instead-of-bundled-one.patch b/texstudio-use-system-hunspell-instead-of-bundled-one.patch
index 0de6584..a99b183 100644
--- a/texstudio-use-system-hunspell-instead-of-bundled-one.patch
+++ b/texstudio-use-system-hunspell-instead-of-bundled-one.patch
@@ -1,17 +1,17 @@
-From ba7a762549297d85e838f07c959786bd35095927 Mon Sep 17 00:00:00 2001
+From 4d8b4c9a0cb9ee40cf36dbf0144fa96556bca487 Mon Sep 17 00:00:00 2001
 From: hannes <hannes at fedoraproject.org>
-Date: Sat, 2 Nov 2013 07:13:52 +0000
-Subject: [PATCH] hunspell fix
+Date: Mon, 4 Nov 2013 20:45:19 +0100
+Subject: [PATCH] hunspell_patch
 
 ---
  spellerutility.h | 2 +-
- texstudio.pro    | 8 +++++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
+ texstudio.pro    | 9 +++++++--
+ 2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/spellerutility.h b/spellerutility.h
 index 7e1b980..c973220 100644
---- spellerutility.h
-+++ spellerutility.h
+--- a/spellerutility.h
++++ b/spellerutility.h
 @@ -13,7 +13,7 @@
  
  #include "mostQtHeaders.h"
@@ -22,29 +22,29 @@ index 7e1b980..c973220 100644
  	Q_OBJECT
  public:
 diff --git a/texstudio.pro b/texstudio.pro
-index d9c9e64..31e1589 100644
---- texstudio.pro
-+++ texstudio.pro
-@@ -432,7 +432,7 @@ unix {
-         utilities
+index fedf628..bdc454b 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -433,7 +433,7 @@ unix {
  }
  
+ DEFINES += HUNSPELL_STATIC
 -include(hunspell/hunspell.pri)
 +include(hunspell.pri)
  
  include(qcodeedit/qcodeedit.pri)
  
-@@ -623,4 +623,10 @@ else {
+@@ -624,4 +624,9 @@ else {
    QMAKE_LFLAGS -= -Wl,-s
    QMAKE_LFLAGS_RELEASE -= -Wl,-s
  }
-+# enable use of pkgconfig
-+unix {
-+	CONFIG	+= link_pkgconfig
-+	# use system hunspell
-+	PKGCONFIG += hunspell
-+}
- 
+-
++# enable use of pkgconfig
++unix {
++	CONFIG	+= link_pkgconfig
++	# use system hunspell
++	PKGCONFIG += hunspell
++}
 -- 
 1.8.3.1
 
diff --git a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
index 45e7c59..2cbc668 100644
--- a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
+++ b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch
@@ -1,14 +1,14 @@
-From e2b9b897bc064fd75ac9c1a6bfa9b061cb2bc097 Mon Sep 17 00:00:00 2001
+From 54aa115007d602a385ff50b1c7a311194a59a07d Mon Sep 17 00:00:00 2001
 From: hannes <hannes at fedoraproject.org>
-Date: Sat, 2 Nov 2013 07:20:05 +0000
-Subject: [PATCH] qtsingle
+Date: Mon, 4 Nov 2013 20:46:43 +0100
+Subject: [PATCH] qtsingle_patch
 
 ---
- texstudio.pro | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ texstudio.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/texstudio.pro b/texstudio.pro
-index 31e1589..77f8343 100644
+index bdc454b..010e866 100644
 --- a/texstudio.pro
 +++ b/texstudio.pro
 @@ -18,8 +18,6 @@ QT += \
@@ -20,13 +20,12 @@ index 31e1589..77f8343 100644
  
  # ##############################
  PRECOMPILED_HEADER = mostQtHeaders.h
-@@ -629,4 +627,5 @@ unix {
- 	# use system hunspell
- 	PKGCONFIG += hunspell
- }
--
-+#use system qtsingleapplication
-+CONFIG += qtsingleapplication
+@@ -630,3 +628,5 @@ unix {
+ 	# use system hunspell
+ 	PKGCONFIG += hunspell
+ }
++#use system qtsingleapplication
++CONFIG += qtsingleapplication
 -- 
 1.8.3.1
 
diff --git a/texstudio.spec b/texstudio.spec
index be6cbd0..106ebf4 100644
--- a/texstudio.spec
+++ b/texstudio.spec
@@ -1,5 +1,5 @@
 Name:           texstudio
-Version:        2.6.4
+Version:        2.6.6
 Release:        1%{?dist}
 
 Summary:        A feature-rich editor for LaTeX documents
@@ -42,7 +42,7 @@ so it keeps it look&feel.
 
 %prep
 %setup -q -n %{name}%{version}
-%patch0 -p0 -b .hunspell
+%patch0 -p1 -b .hunspell
 %patch1 -p1 -b .qtsingle
 %patch2 -p0 -b .xdg
 
@@ -124,6 +124,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
 %doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
 
 %changelog
+* Sun Nov 03 2013 Johannes Lips <hannes at fedoraproject.org> 2.6.6-1
+- Update to latest upstream version 2.6.6
+
 * Sat Nov 02 2013 Johannes Lips <hannes at fedoraproject.org> 2.6.4-1
 - Update to latest upstream version 2.6.4