diff --git a/.gitignore b/.gitignore index c79ae52..9724e93 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /texstudio-2.7.0.tar.gz /texstudio-2.8.0.tar.gz /texstudio-2.8.2.tar.gz +/texstudio-2.8.4.tar.gz diff --git a/sources b/sources index 0f881f4..dc319ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9186f1b08338f35fdae72027be9e837a texstudio-2.8.2.tar.gz +d67f0e0f0952d72fc3e66caabaf160ce texstudio-2.8.4.tar.gz diff --git a/texstudio-use-system-hunspell-instead-of-bundled-one.patch b/texstudio-use-system-hunspell-instead-of-bundled-one.patch index 5b52bc0..1e2f8fb 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 4d0e816c1b016c4ec9d54704f40789b1c7b79654 Mon Sep 17 00:00:00 2001 +From 7ac1dda09bf5241aca7c09af5fac5c173a6ea653 Mon Sep 17 00:00:00 2001 From: hannes -Date: Fri, 20 Jun 2014 19:21:51 +0200 -Subject: [PATCH 1/3] hunspell patch +Date: Tue, 9 Sep 2014 20:27:22 +0200 +Subject: [PATCH] hunspell_patch --- texstudio.pro | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/texstudio.pro b/texstudio.pro -index 7d07a6a..449dbd0 100644 +index 4f778dd..e125fef 100644 --- a/texstudio.pro +++ b/texstudio.pro -@@ -457,7 +457,7 @@ unix { +@@ -466,7 +466,7 @@ unix { } DEFINES += HUNSPELL_STATIC @@ -20,17 +20,17 @@ index 7d07a6a..449dbd0 100644 include(qcodeedit/qcodeedit.pri) -@@ -663,4 +663,9 @@ else { +@@ -672,4 +672,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.9.3 diff --git a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch index 53baf40..8e005d8 100644 --- a/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch +++ b/texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch @@ -1,32 +1,30 @@ -From 0685635511fcf6b5c7287323804f3c1c819ead64 Mon Sep 17 00:00:00 2001 +From 74c852ca1acfd5613bf45153c8ca9780c698241a Mon Sep 17 00:00:00 2001 From: hannes -Date: Fri, 20 Jun 2014 19:23:56 +0200 -Subject: [PATCH 2/3] qtsingle +Date: Tue, 9 Sep 2014 20:29:09 +0200 +Subject: [PATCH 2/2] qtsingle --- - 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 449dbd0..ad01fdb 100644 +index e125fef..5f1e323 100644 --- a/texstudio.pro +++ b/texstudio.pro -@@ -32,9 +32,6 @@ QT += \ +@@ -33,8 +33,6 @@ QT += \ } DEFINES += PHONON } -contains($$list($$[QT_VERSION]), 4.3.*):message("qt 4.3.x") -else:include(qtsingleapplication/qtsingleapplication.pri) -- + # ############################## - precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h - HEADERS += texmaker.h \ -@@ -669,3 +666,5 @@ unix { - # use system hunspell - PKGCONFIG += hunspell - } -+#use system qtsingleapplication -+CONFIG += qtsingleapplication + # precompile_header: PRECOMPILED_HEADER = mostQtHeaders.h +@@ -678,3 +676,5 @@ unix { + # use system hunspell + PKGCONFIG += hunspell + } ++#use system qtsingleapplication ++CONFIG += qtsingleapplication -- 1.9.3 - diff --git a/texstudio.spec b/texstudio.spec index b933b9f..97450c9 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -1,5 +1,5 @@ Name: texstudio -Version: 2.8.2 +Version: 2.8.4 Release: 1%{?dist} Summary: A feature-rich editor for LaTeX documents @@ -125,6 +125,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: %doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt %changelog +* Tue Sep 09 2014 Johannes Lips 2.8.4-1 +- Update to latest upstream version 2.8.4 + +* Mon Aug 18 2014 Fedora Release Engineering - 2.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jul 26 2014 Johannes Lips 2.8.2-1 - Update to latest upstream version 2.8.2