Update to 2.6.0

.gitignore

@@ -4,3 +4,4 @@
 /texstudio-2.5.tar.gz
 /texstudio-2.5.1.orig.tar.gz
 /texstudio-2.5.2.tar.gz
+/texstudio-2.6.0.tar.gz

sources

@@ -1 +1 @@
-fce221c9df49e82cfb5b8d7c702c4076  texstudio-2.5.2.tar.gz
+7394d7e7d713967cfddf8737fe748fef  texstudio-2.6.0.tar.gz

texstudio-use-system-hunspell-instead-of-bundled-one.patch

@@ -1,15 +1,15 @@
-From 48b3ef523393bf584ad92910fa6173f33f4bc0f3 Mon Sep 17 00:00:00 2001
+From 30c73dbd1c85c86b23db63ebd8adf41e14286c23 Mon Sep 17 00:00:00 2001
 From: hannes <hannes@fedoraproject.org>
-Date: Sun, 9 Sep 2012 09:26:47 +0200
-Subject: [PATCH] hunspell
+Date: Sun, 16 Jun 2013 09:53:46 +0200
+Subject: [PATCH 1/2] patch_hunspell
 
 ---
  spellerutility.h |  2 +-
  texstudio.pro    | 38 ++++++--------------------------------
  2 files changed, 7 insertions(+), 33 deletions(-)
 
-diff --git a/spellerutility.h b/spellerutility.h
-index 1e1d6e2..083f412 100644
+diff --git spellerutility.h spellerutility.h
+index 7e1b980..c973220 100644
 --- spellerutility.h
 +++ spellerutility.h
 @@ -13,7 +13,7 @@
@@ -17,15 +17,15 @@ index 1e1d6e2..083f412 100644
  #include "mostQtHeaders.h"
  
 -#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
++#include "hunspell.hxx"
  class SpellerUtility: public QObject {
  	Q_OBJECT
  public:
 diff --git texstudio.pro texstudio.pro
-index ee28d78..86d8f45 100644
+index b073255..d72f7ea 100644
 --- texstudio.pro
 +++ texstudio.pro
-@@ -52,24 +52,6 @@ HEADERS += texmaker.h \
+@@ -53,25 +53,6 @@ HEADERS += texmaker.h \
      debughelper.h \
      thesaurusdialog.h \
      xmltagslistwidget.h \
@@ -47,18 +47,11 @@ index ee28d78..86d8f45 100644
 -    hunspell/filemgr.hxx \
 -    hunspell/hunzip.hxx \
 -    hunspell/w_char.hxx \
+-    hunspell/replist.hxx \
      qcodeedit/lib/qeditorinputbinding.h \
      qcodeedit/lib/qeditorinputbindinginterface.h \
-     randomtextgenerator.h \
-@@ -85,7 +67,6 @@ HEADERS += texmaker.h \
-     latexdocument.h \
-     unicodeinsertion.h \
-     universalinputdialog.h \
--    hunspell/replist.hxx \
-     scriptengine.h \
-     insertgraphics.h \
-     txstabwidget.h \
-@@ -154,18 +135,6 @@ SOURCES += main.cpp \
+     qcodeedit/lib/qformat.h \
+@@ -171,18 +152,6 @@ SOURCES += main.cpp \
      codesnippet.cpp \
      thesaurusdialog.cpp \
      xmltagslistwidget.cpp \
@@ -76,18 +69,18 @@ index ee28d78..86d8f45 100644
 -    hunspell/hunzip.cxx \
      encodingdialog.cpp \
      qcodeedit/lib/qeditorinputbinding.cpp \
-     randomtextgenerator.cpp \
-@@ -569,4 +538,9 @@ SOURCES+=synctex_parser_utils.c synctex_parser.c
- #QMAKE_CXXFLAGS_DEBUG += -Werror  -Wall -Wextra  -Winit-self -Wmain -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas  -Wundef  -Wpointer-arith -Wtype-limits -Wwrite-strings -Wclobbered  -Wempty-body -Wsign-compare -Waddress -Wlogical-op   -Winline
- QMAKE_CXXFLAGS_DEBUG += -Wall -Wextra  -Winit-self -Wmissing-include-dirs -Wtrigraphs -Wunused -Wunknown-pragmas  -Wundef  -Wpointer-arith  -Wwrite-strings -Wempty-body -Wsign-compare -Waddress   -Winline
- 
+     qcodeedit/lib/qformat.cpp \
+@@ -676,4 +645,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.7.11.4
+1.8.2.1
 

texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch

@@ -1,17 +1,17 @@
-From 7005c1602c40064fb9ef9f5a2fa0c0f0f243a320 Mon Sep 17 00:00:00 2001
+From 99c3b431788b0810fea667ff70a0cb20536a4dd8 Mon Sep 17 00:00:00 2001
 From: hannes <hannes@fedoraproject.org>
-Date: Wed, 30 Nov 2011 21:21:49 +0000
-Subject: [PATCH 2/2] qtsingle
+Date: Sun, 16 Jun 2013 10:02:15 +0200
+Subject: [PATCH 2/2] qtsingle_patch
 
 ---
- texstudio.pro |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
+ texstudio.pro | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/texstudio.pro b/texstudio.pro
-index c5b5ec6..68f36ca 100644
---- texstudio.pro
-+++ texstudio.pro
-@@ -10,8 +10,6 @@ QT += network \
+index d72f7ea..af56822 100644
+--- a/texstudio.pro
++++ b/texstudio.pro
+@@ -11,8 +11,6 @@ QT += network \
      QT += phonon
      DEFINES += PHONON
  }
@@ -20,13 +20,12 @@ index c5b5ec6..68f36ca 100644
  
  # ##############################
  PRECOMPILED_HEADER = mostQtHeaders.h
-@@ -514,3 +512,6 @@ unix {
- 	# use system hunspell
- 	PKGCONFIG += hunspell
+@@ -651,3 +649,5 @@ unix {
+ 	# use system hunspell
+ 	PKGCONFIG += hunspell
  }
-+
-+#use system qtsingleapplication
-+CONFIG += qtsingleapplication
++#use system qtsingleapplication
++CONFIG += qtsingleapplication
 -- 
-1.7.7.3
+1.8.2.1
 

texstudio.spec

@@ -1,6 +1,6 @@
 Name:           texstudio
-Version:        2.5.2
-Release:        2%{?dist}
+Version:        2.6.0
+Release:        1%{?dist}
 
 Summary:        A feature-rich editor for LaTeX documents
 Group:          Applications/Publishing
@@ -112,6 +112,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
 %{_datadir}/texstudio/*.stopWords.level2
 %{_datadir}/texstudio/de.badWords
 %{_datadir}/texstudio/template_*.tex
+%{_datadir}/texstudio/template_*.zip
 %{_datadir}/texstudio/texstudio.svg
 %{_datadir}/texstudio/*.json
 %{_datadir}/texstudio/*.js
@@ -123,6 +124,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
 %doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt
 
 %changelog
+* Sun Jun 16 2013 Johannes Lips <hannes@fedoraproject.org> 2.6.0-1
+- Update to latest upstream version 2.6.0
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild