[texmaker] Updated to latest upstream release
nonamedotc
nonamedotc at fedoraproject.org
Sun Aug 10 02:31:21 UTC 2014
commit 34e1c641134088a821529d30f5efe2eaa7baf599
Author: nonamedotc <nonamedotc at fedoraproject.org>
Date: Sat Aug 9 21:31:20 2014 -0500
Updated to latest upstream release
.gitignore | 1 +
sources | 2 +-
texmaker-4.3-fedora.patch | 155 +++++++++++++++++++++++++++++++++++++++++++++
texmaker.spec | 14 +++--
4 files changed, 165 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff0054c..2aa2217 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ texmaker-2.0.tar.bz2
/texmaker-4.0.3.tar.bz2
/texmaker-4.1.1.tar.bz2
/texmaker-4.2.tar.bz2
+/texmaker-4.3.tar.bz2
diff --git a/sources b/sources
index 1be19ea..f5421ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9297da00423e341b76295f208a91096c texmaker-4.2.tar.bz2
+f2ba669a886c01ed594c0e7e787b55df texmaker-4.3.tar.bz2
diff --git a/texmaker-4.3-fedora.patch b/texmaker-4.3-fedora.patch
new file mode 100644
index 0000000..3f80343
--- /dev/null
+++ b/texmaker-4.3-fedora.patch
@@ -0,0 +1,155 @@
+--- texmaker.cpp.orig 2014-08-09 17:17:23.115696932 -0500
++++ texmaker.cpp 2014-08-09 17:21:46.720833849 -0500
+@@ -4292,28 +4292,10 @@
+ metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
+ // xdvi %.dvi -sourceposition @:%.tex
+ // kdvi "file:%.dvi#src:@ %.tex"
+-switch (desktop_env)
+- {
+- case 1:
+- {
+- viewdvi_command=config->value("Tools/Dvi","evince %.dvi").toString();
+- viewps_command=config->value("Tools/Ps","evince %.ps").toString();
+- viewpdf_command=config->value("Tools/Pdf","evince %.pdf").toString();
+- }break;
+- case 2:
+- {
+- viewdvi_command=config->value("Tools/Dvi","kdvi %.dvi").toString();
+- viewps_command=config->value("Tools/Ps","kghostview %.ps").toString();
+- viewpdf_command=config->value("Tools/Pdf","kpdf %.pdf").toString();
+- }break;
+- case 3:
+- {
+- viewdvi_command=config->value("Tools/Dvi","okular %.dvi").toString();
+- viewps_command=config->value("Tools/Ps","okular %.ps").toString();
+- viewpdf_command=config->value("Tools/Pdf","okular %.pdf").toString();
+- }break;
+- }
+
++viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString();
++viewps_command=config->value("Tools/Ps","xdg-open %.ps").toString();
++viewpdf_command=config->value("Tools/Pdf","xdg-open %.pdf").toString();
+
+
+ ghostscript_command=config->value("Tools/Ghostscript","gs").toString();
+@@ -4558,7 +4540,7 @@
+ #ifdef DEBIAN_SPELLDIR
+ QString dicDir=PREFIX"/share/myspell/dicts/";
+ #else
+-QString dicDir=PREFIX"/share/texmaker/";
++QString dicDir=PREFIX"/share/myspell/";
+ #endif
+ #endif
+
+--- texmaker.pro.orig 2014-08-09 17:17:11.812687942 -0500
++++ texmaker.pro 2014-08-09 17:19:12.207780926 -0500
+@@ -19,11 +19,11 @@
+ unix:!macx {
+ contains( QT_VERSION, "^5.*" ) {
+ CONFIG += link_pkgconfig
+-PKGCONFIG = poppler-qt5
++PKGCONFIG = poppler-qt5 hunspell
+ DEFINES += POPPLER24
+ } else {
+ CONFIG += link_pkgconfig
+-PKGCONFIG = poppler-qt4
++PKGCONFIG = poppler-qt4 hunspell
+ DETECTEDPOPPLER=$$system(pkg-config --modversion poppler)
+ contains( DETECTEDPOPPLER, "^0.18.*" ){
+ DEFINES += OLDPOPPLER
+@@ -96,25 +96,6 @@
+ unicodedialog.h \
+ unicodeview.h \
+ quickbeamerdialog.h \
+- hunspell/affentry.hxx \
+- hunspell/affixmgr.hxx \
+- hunspell/atypes.hxx \
+- hunspell/baseaffix.hxx \
+- hunspell/csutil.hxx \
+- hunspell/dictmgr.hxx \
+- hunspell/hashmgr.hxx \
+- hunspell/htypes.hxx \
+- hunspell/hunspell.hxx \
+- hunspell/hunspell.h \
+- hunspell/langnum.hxx \
+- hunspell/license.hunspell \
+- hunspell/phonet.hxx \
+- hunspell/suggestmgr.hxx \
+- hunspell/license.myspell \
+- hunspell/filemgr.hxx \
+- hunspell/hunzip.hxx \
+- hunspell/replist.hxx \
+- hunspell/w_char.hxx \
+ singleapp/qtlocalpeer.h \
+ singleapp/qtlockedfile.h \
+ singleapp/qtsingleapplication.h \
+@@ -206,18 +187,6 @@
+ unicodedialog.cpp \
+ unicodeview.cpp \
+ quickbeamerdialog.cpp \
+- hunspell/affentry.cxx \
+- hunspell/affixmgr.cxx \
+- hunspell/csutil.cxx \
+- hunspell/dictmgr.cxx \
+- hunspell/hashmgr.cxx \
+- hunspell/hunspell.cxx \
+- hunspell/phonet.cxx \
+- hunspell/suggestmgr.cxx \
+- hunspell/utf_info.cxx \
+- hunspell/filemgr.cxx \
+- hunspell/replist.cxx \
+- hunspell/hunzip.cxx \
+ singleapp/qtlocalpeer.cpp \
+ singleapp/qtlockedfile.cpp \
+ singleapp/qtsingleapplication.cpp \
+@@ -430,39 +399,6 @@
+ locale/texmaker_ar.qm \
+ locale/texmaker_lv.qm \
+ locale/texmaker_uk.qm \
+- dictionaries/nl_NL.aff \
+- dictionaries/nl_NL.dic \
+- dictionaries/de_DE.aff \
+- dictionaries/de_DE.dic \
+- dictionaries/en_GB.aff \
+- dictionaries/en_GB.dic \
+- dictionaries/en_US.aff \
+- dictionaries/en_US.dic \
+- dictionaries/es_ES.aff \
+- dictionaries/es_ES.dic \
+- dictionaries/fr_FR.aff \
+- dictionaries/fr_FR.dic \
+- dictionaries/it_IT.aff \
+- dictionaries/it_IT.dic \
+- dictionaries/it_IT_README.txt \
+- dictionaries/hu_HU.aff \
+- dictionaries/hu_HU.dic \
+- dictionaries/README_hu_HU.txt \
+- dictionaries/cs_CZ.aff \
+- dictionaries/cs_CZ.dic \
+- dictionaries/pl_PL.aff \
+- dictionaries/pl_PL.dic \
+- dictionaries/pt_PT.aff \
+- dictionaries/pt_PT.dic \
+- dictionaries/ca_CA.aff \
+- dictionaries/ca_CA.dic \
+- dictionaries/README_pt_PT.txt \
+- dictionaries/README_pl.txt \
+- dictionaries/README_cs_CZ.txt \
+- dictionaries/README_de_DE_frami.txt \
+- dictionaries/README_DIC_fr_FR.txt \
+- dictionaries/README_es_ES.txt \
+- dictionaries/README_en_US.txt
+ INSTALLS += utilities
+
+ desktop.files = utilities/texmaker.desktop
+--- spellerdialog.h.orig 2014-08-09 17:17:36.312706931 -0500
++++ spellerdialog.h 2014-08-09 17:20:07.778817495 -0500
+@@ -13,7 +13,7 @@
+
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+
+ #include <QTextCursor>
+
diff --git a/texmaker.spec b/texmaker.spec
index 67eb016..a8ccf55 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,7 +1,7 @@
Summary: LaTeX editor
Name: texmaker
-Version: 4.2
-Release: 2%{?dist}
+Version: 4.3
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: Applications/Publishing
@@ -14,7 +14,7 @@ BuildRequires: desktop-file-utils
Requires: tetex-latex, tetex-dvipost, tetex-xdvi
# Patch to use default Fedora's document viewer, system's hunspell and
# system qtsingleapplication instead of bundled ones
-Patch0: %{name}-fedora.patch
+Patch0: %{name}-%{version}-fedora.patch
%description
Texmaker is a program, that integrates many tools needed to develop
@@ -26,7 +26,7 @@ license
%setup -q
%patch0 -p0 -b .fedora
rm -r hunspell
-#rm -r singleapp
+
%build
export QTDIR=%{_libdir}/qt5
@@ -73,14 +73,16 @@ fi
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%doc utilities/AUTHORS utilities/COPYING
+%doc utilities/AUTHORS utilities/COPYING doc/*
%{_bindir}/texmaker
-%{_datadir}/texmaker/
%{_datadir}/applications/texmaker.desktop
%{_datadir}/icons/hicolor/*/apps/texmaker.png
%{_datadir}/pixmaps/texmaker.png
%changelog
+* Thu Aug 07 2014 Mukundan Ragavan <nonamedotc at fedoraproject.org> - 1:4.3-1
+- Updated to latest upstream release
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list