[texmaker] Update to 3.1

Deji Akingunola deji at fedoraproject.org
Sat Aug 27 06:31:44 UTC 2011


commit 47f38edd722afb8f0ff8f389f7082d0e2ad9a5c0
Author: Deji Akingunola <dakingun at mail.com>
Date:   Sat Aug 27 02:34:02 2011 -0400

    Update to 3.1

 .gitignore           |    1 +
 sources              |    2 +-
 texmaker-tools.patch |  104 +++++++++++++++++++++++++++++++++++++++++++------
 texmaker.spec        |   13 ++----
 4 files changed, 97 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5059c1f..3eace16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ texmaker-2.0.tar.bz2
 /texmaker-2.1.tar.bz2
 /texmaker-2.3.tar.bz2
 /texmaker-3.0.2.tar.bz2
+/texmaker-3.1.tar.bz2
diff --git a/sources b/sources
index c4b47c9..7ca6f6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d375c8f486fe44f3f2a2a7d2ddac08f3  texmaker-3.0.2.tar.bz2
+10a14c75abbb7234d4e5e58a7c85b110  texmaker-3.1.tar.bz2
diff --git a/texmaker-tools.patch b/texmaker-tools.patch
index da870c9..25f3e56 100644
--- a/texmaker-tools.patch
+++ b/texmaker-tools.patch
@@ -1,6 +1,6 @@
---- texmaker.cpp	2011-04-25 09:12:44.000000000 -0400
-+++ texmaker.cpp.new	2011-04-28 20:48:04.273244167 -0400
-@@ -3297,29 +3297,9 @@
+--- texmaker.cpp	2011-07-22 15:46:04.000000000 -0400
++++ texmaker.cpp.new	2011-08-27 02:10:55.111936951 -0400
+@@ -3389,28 +3389,9 @@
  metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString();
  // xdvi %.dvi  -sourceposition @:%.tex
  // kdvi "file:%.dvi#src:@ %.tex"
@@ -26,14 +26,13 @@
 -		}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();
- asymptote_command=config->value("Tools/Asymptote","asy %.asy").toString();
-@@ -3474,7 +3454,7 @@
+@@ -3590,7 +3571,7 @@
  #ifdef USB_VERSION
  QString dicDir=QCoreApplication::applicationDirPath() + "/";
  #else
@@ -42,8 +41,8 @@
  #endif
  
  #endif
---- texmaker.pro	2011-04-25 04:39:07.000000000 -0400
-+++ texmaker.pro.new	2011-04-28 20:59:42.124519826 -0400
+--- texmaker.pro	2011-07-21 04:57:13.000000000 -0400
++++ texmaker.pro.new	2011-08-27 02:19:33.296458752 -0400
 @@ -4,7 +4,8 @@
  QT += network \
        xml \
@@ -51,10 +50,10 @@
 -CONFIG	+= qt warn_off release
 +CONFIG	+= qt warn_off release link_pkgconfig
 +PKGCONFIG = hunspell
- TEXMAKERVERSION=3.0.2
+ TEXMAKERVERSION=3.1
  DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
  DEFINES += HAVE_SPLASH
-@@ -56,25 +57,6 @@
+@@ -62,25 +63,6 @@
  	usercompletiondialog.h \
  	synctex_parser.h \
  	synctex_parser_utils.h \
@@ -80,7 +79,7 @@
  	singleapp/qtlocalpeer.h \
  	singleapp/qtlockedfile.h \
  	singleapp/qtsingleapplication.h \
-@@ -150,18 +132,6 @@
+@@ -162,18 +144,6 @@
  	usercompletiondialog.cpp \
  	synctex_parser.c \
  	synctex_parser_utils.c \
@@ -99,7 +98,7 @@
  	singleapp/qtlocalpeer.cpp \
  	singleapp/qtlockedfile.cpp \
  	singleapp/qtsingleapplication.cpp \
-@@ -253,7 +223,7 @@
+@@ -268,7 +238,7 @@
  DEFINES += PREFIX=\\\"$${PREFIX}\\\"
  target.path = $${PREFIX}/bin
  
@@ -108,8 +107,87 @@
  
  INSTALLS = target
  HEADERS	+= x11fontdialog.h 
+@@ -339,26 +309,7 @@
+ 	locale/texmaker_nl.qm \
+ 	locale/texmaker_fa.qm \
+ 	locale/texmaker_pl.qm \
+-	locale/texmaker_hu.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/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/README_de_DE_frami.txt \
+-	dictionaries/README_DIC_fr_FR.txt \
+-	dictionaries/README_es_ES.txt 
++	locale/texmaker_hu.qm 
+ INSTALLS += utilities
+ 
+ desktop.path = $${DESKTOPDIR}
+@@ -444,21 +395,7 @@
+ 	locale/texmaker_nl.qm \
+ 	locale/texmaker_fa.qm \
+ 	locale/texmaker_pl.qm \
+-	locale/texmaker_hu.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/es_ES.aff \
+-	dictionaries/es_ES.dic \
+-	dictionaries/fr_FR.aff \
+-	dictionaries/fr_FR.dic \
+-	dictionaries/it_IT.aff \
+-	dictionaries/it_IT.dic \
+-	dictionaries/hu_HU.aff \
+-	dictionaries/hu_HU.dic
++	locale/texmaker_hu.qm 
+ INSTALLS += utilities
+ 
+ others.path = texmakerwin32
+@@ -556,26 +493,7 @@
+ 	locale/texmaker_zh_CN.qm \
+ 	locale/texmaker_zh_TW.qm \
+ 	locale/texmaker_cs.qm \
+-	locale/texmaker_nl.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/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/README_de_DE_frami.txt \
+-	dictionaries/README_DIC_fr_FR.txt \
+-	dictionaries/README_es_ES.txt 
++	locale/texmaker_nl.qm 
+ QMAKE_BUNDLE_DATA += utilities
+ INSTALLS += utilities
+ ICON = texmaker.icns
 --- spellerdialog.h	2011-02-25 14:19:34.000000000 -0500
-+++ spellerdialog.h.new	2011-04-28 20:53:50.152920024 -0400
++++ spellerdialog.h.new	2011-08-27 02:14:16.529418885 -0400
 @@ -13,7 +13,7 @@
  
  #include "ui_spellerdialog.h"
diff --git a/texmaker.spec b/texmaker.spec
index 9fe4787..7906a54 100644
--- a/texmaker.spec
+++ b/texmaker.spec
@@ -1,7 +1,7 @@
 Summary:	LaTeX editor
 Name:		texmaker
-Version:	3.0.2
-Release:	3%{?dist}
+Version:	3.1
+Release:	1%{?dist}
 Epoch:		1
 License:	GPLv2+
 Group:		Applications/Publishing
@@ -80,15 +80,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/applications/fedora-texmaker.desktop
 %{_datadir}/icons/hicolor/*/apps/texmaker.png
 %{_datadir}/pixmaps/texmaker.png
-%exclude %{_datadir}/texmaker/*.dic
-%exclude %{_datadir}/texmaker/*.aff
 
 %changelog
-* Fri Jul 15 2011 Marek Kasik <mkasik at redhat.com> - 3.0.2-3
-- Rebuild (poppler-0.17.0)
-
-* Wed May 25 2011 Caolán McNamara <caolanm at redhat.com> - 3.0.2-2
-- rebuild for new hunspell
+* Sat Aug 27 2011 Deji Akingunola <dakingun at gmail.com> - 3.1-1
+- Update to 3.1
 
 * Thu Apr 28 2011 Deji Akingunola <dakingun at gmail.com> - 3.0.2-1
 - Update to 3.0.2


More information about the scm-commits mailing list