rpms/texmaker/devel texmaker-tools.patch, 1.11, 1.12 texmaker.spec, 1.23, 1.24

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/texmaker/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18769

Modified Files:
	texmaker-tools.patch texmaker.spec 
Log Message:
* Mon Nov 02 2009 Deji Akingunola <dakingun at gmail.com> - 1.9.2-3
- Update with a more complete patch to use system hunspell (Caolan McNamara)


texmaker-tools.patch:
 spellerdialog.h |    2 +-
 texmaker.cpp    |   26 ++++----------------------
 texmaker.pro    |   34 ++--------------------------------
 3 files changed, 7 insertions(+), 55 deletions(-)

Index: texmaker-tools.patch
===================================================================
RCS file: /cvs/pkgs/rpms/texmaker/devel/texmaker-tools.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- texmaker-tools.patch	17 Jul 2009 05:19:17 -0000	1.11
+++ texmaker-tools.patch	2 Nov 2009 19:11:15 -0000	1.12
@@ -40,3 +40,71 @@
  #endif
  #if defined( Q_WS_MACX )
  QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/";
+--- spellerdialog.h
++++ spellerdialog.h.new
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+--- texmaker.pro
++++ texmaker.pro.new
+@@ -3,7 +3,8 @@ TEMPLATE	= app
+ TARGET	 = texmaker
+ QT += network \
+       xml
+-CONFIG	+= qt warn_off release
++CONFIG	+= qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
+ ###############################
+ HEADERS	+= texmaker.h \
+ 	texmakerapp.h \
+@@ -39,25 +40,6 @@ HEADERS	+= texmaker.h \
+ 	manhattanstyle.h \
+ 	stylehelper.h \
+ 	styleanimator.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 \
+@@ -96,18 +78,6 @@ SOURCES	+= main.cpp \
+ 	manhattanstyle.cpp \
+ 	stylehelper.cpp \
+ 	styleanimator.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 \


Index: texmaker.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texmaker/devel/texmaker.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- texmaker.spec	27 Jul 2009 05:53:00 -0000	1.23
+++ texmaker.spec	2 Nov 2009 19:11:15 -0000	1.24
@@ -1,16 +1,16 @@
 Summary:	LaTeX editor
 Name:		texmaker
 Version:	1.9.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 License:	GPLv2+
 Group:		Applications/Publishing
 URL:		http://www.xm1math.net/texmaker/
 Source:		http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	qt4-devel
+BuildRequires:	qt4-devel, hunspell-devel
 BuildRequires:	desktop-file-utils
-Requires:	tetex-latex, tetex-dvipost, tetex-xdvi, hunspell
+Requires:	tetex-latex, tetex-dvipost, tetex-xdvi
 # Patch to use default Fedora's document viewer and system's hunspell
 Patch0:		%{name}-tools.patch
 
@@ -84,6 +84,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %exclude %{_datadir}/texmaker/*.aff
 
 %changelog
+* Mon Nov 02 2009 Deji Akingunola <dakingun at gmail.com> - 1.9.2-3
+- Update with a more complete patch to use system hunspell (Caolan McNamara)
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.9.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild