diff --git a/.cvsignore b/.cvsignore index 4ed9efa..593f5bf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -texmaker-1.6.tar.bz2 +texmaker-1.7.tar.bz2 diff --git a/sources b/sources index cfa298f..d17de12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -941ac678dad630d686dbee3ecd75039a texmaker-1.6.tar.bz2 +9051a0b223452fadbe4644b082781d37 texmaker-1.7.tar.bz2 diff --git a/texmaker-tools.patch b/texmaker-tools.patch index d5311e8..bcf019f 100644 --- a/texmaker-tools.patch +++ b/texmaker-tools.patch @@ -1,25 +1,53 @@ ---- texmaker.cpp 2007-06-05 14:51:01.000000000 -0400 -+++ texmaker.cpp.new 2007-06-21 14:28:03.000000000 -0400 -@@ -2078,18 +2078,18 @@ - #endif - #ifdef Q_WS_X11 +--- texmaker.cpp 2008-04-22 04:45:33.000000000 -0400 ++++ texmaker.cpp.new 2008-04-28 09:26:36.000000000 -0400 +@@ -2164,7 +2164,7 @@ + } + latex_command=config->value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString(); -dvips_command=config->value("Tools/Dvips","dvips -o %.ps %.dvi").toString(); +dvips_command=config->value("Tools/Dvips","dvips -o -t %.ps %.dvi").toString(); ps2pdf_command=config->value("Tools/Ps2pdf","ps2pdf %.ps").toString(); makeindex_command=config->value("Tools/Makeindex","makeindex %.idx").toString(); bibtex_command=config->value("Tools/Bibtex","bibtex %.aux").toString(); - pdflatex_command=config->value("Tools/Pdflatex","pdflatex -interaction=nonstopmode %.tex").toString(); - dvipdf_command=config->value("Tools/Dvipdf","dvipdfm %.dvi").toString(); +@@ -2173,29 +2173,9 @@ metapost_command=config->value("Tools/Metapost","mpost --interaction nonstopmode ").toString(); --viewdvi_command=config->value("Tools/Dvi","xdvi %.dvi").toString(); -+viewdvi_command=config->value("Tools/Dvi","xdg-open %.dvi").toString(); // xdvi %.dvi -sourceposition @:%.tex // kdvi "file:%.dvi#src:@ %.tex" --viewps_command=config->value("Tools/Ps","gv %.ps").toString(); --viewpdf_command=config->value("Tools/Pdf","xpdf %.pdf").toString(); +-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(); + +@@ -2269,7 +2249,7 @@ + author=config->value("Quick/Author","").toString(); + + #if defined( Q_WS_X11 ) +-QString dicDir=PREFIX"/share/texmaker/"; ++QString dicDir=PREFIX"/share/myspell/"; #endif - userquick_command=config->value("Tools/Userquick","latex -interaction=nonstopmode %.tex|bibtex %.aux|latex -interaction=nonstopmode %.tex|latex -interaction=nonstopmode %.tex|xdvi %.dvi").toString(); + #if defined( Q_WS_MACX ) + QString dicDir=QCoreApplication::applicationDirPath() + "/../Resources/"; diff --git a/texmaker.spec b/texmaker.spec index 4aa9c62..eb68fcb 100644 --- a/texmaker.spec +++ b/texmaker.spec @@ -1,21 +1,19 @@ -Summary: LaTeX editor -Name: texmaker -Version: 1.6 -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: desktop-file-utils -Requires: tetex-latex, tetex-dvipost, tetex-xdvi -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -Patch0: %{name}-desktop.patch +Summary: LaTeX editor +Name: texmaker +Version: 1.7 +Release: 1%{?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: desktop-file-utils +Requires: tetex-latex, tetex-dvipost, tetex-xdvi, hunspell +Patch0: %{name}-desktop.patch # Patch to use default Fedora's document viewer -Patch1: %{name}-tools.patch +Patch1: %{name}-tools.patch %description Texmaker is a program, that integrates many tools needed to develop @@ -48,10 +46,10 @@ install -Dp -m 0644 utilities/texmaker128x128.png %{buildroot}%{_datadir}/icons/ # Don't package these twice rm -rf %{buildroot}%{_datadir}/%{name}/{AUTHORS,COPYING,*.desktop,tex*.png} -desktop-file-install --vendor fedora \ - --dir %buildroot%_datadir/applications \ - --remove-category Publishing \ - utilities/texmaker.desktop +desktop-file-install --vendor fedora \ + --dir %buildroot%_datadir/applications \ + --remove-category Publishing \ + utilities/texmaker.desktop %post update-desktop-database &> /dev/null ||: @@ -80,8 +78,13 @@ rm -rf %buildroot %{_datadir}/texmaker/ %{_datadir}/applications/fedora-texmaker.desktop %{_datadir}/icons/hicolor/*/apps/texmaker.png +%exclude %{_datadir}/texmaker/*.dic +%exclude %{_datadir}/texmaker/*.aff %changelog +* Mon Apr 28 2008 Deji Akingunola - 1.7-1 +- New Release + * Sat Aug 18 2007 Deji Akingunola - 1:1.6-3 - Use xdg-open instead of hardcording apps (bz#245269)