rpms/texmaker/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 texmaker-desktop.patch, 1.2, 1.3 texmaker-tools.patch, 1.3, 1.4 texmaker.spec, 1.11, 1.12 texmaker-qt42.patch, 1.1, NONE
Deji Akingunola (deji)
fedora-extras-commits at redhat.com
Wed Jan 3 07:26:19 UTC 2007
Author: deji
Update of /cvs/extras/rpms/texmaker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20729/FC-5
Modified Files:
.cvsignore sources texmaker-desktop.patch texmaker-tools.patch
texmaker.spec
Removed Files:
texmaker-qt42.patch
Log Message:
auto-import texmaker-1.5-1 on branch FC-5 from texmaker-1.5-1.src.rpm
New release
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 30 Aug 2006 07:05:37 -0000 1.4
+++ .cvsignore 3 Jan 2007 07:25:49 -0000 1.5
@@ -1 +1 @@
-texmaker-1.4.tar.bz2
+texmaker-1.5.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 30 Aug 2006 07:05:37 -0000 1.4
+++ sources 3 Jan 2007 07:25:49 -0000 1.5
@@ -1 +1 @@
-c0d2146c849e06e5ff2e0d409abff16b texmaker-1.4.tar.bz2
+1e7fafbd3fe1de44019d900e15197b81 texmaker-1.5.tar.bz2
texmaker-desktop.patch:
Index: texmaker-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- texmaker-desktop.patch 25 May 2006 19:03:48 -0000 1.2
+++ texmaker-desktop.patch 3 Jan 2007 07:25:49 -0000 1.3
@@ -1,12 +1,13 @@
--- utilities/texmaker.desktop 2005-04-24 14:55:25.000000000 -0400
+++ utilities/texmaker.desktop.new 2005-10-28 10:15:46.000000000 -0400
-@@ -1,20 +1,16 @@
+@@ -1,20 +1,18 @@
[Desktop Entry]
--Categories=Application;Utility;TextEditor;Publishing;
--Comment=
--Comment[fr]=
+-Categories=Application;Office;Publishing;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;Qt;X-Misc;
++Categories=Office;Publishing;Qt;
+ Comment=
+ Comment[fr]=
-DocPath=
-+Categories=Application;Utility;TextEditor;Publishing;Qt;
++X-KDE-DocPath=
Encoding=UTF-8
Exec=texmaker
GenericName=LaTeX Editor
@@ -23,4 +24,4 @@
Terminal=false
-TerminalOptions=
Type=Application
-
+-
texmaker-tools.patch:
Index: texmaker-tools.patch
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker-tools.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- texmaker-tools.patch 30 Aug 2006 07:05:37 -0000 1.3
+++ texmaker-tools.patch 3 Jan 2007 07:25:49 -0000 1.4
@@ -1,24 +1,24 @@
---- texmaker.cpp 2006-07-28 17:07:05.000000000 -0400
-+++ texmaker.cpp.new 2006-08-22 23:32:30.000000000 -0400
-@@ -1851,7 +1851,7 @@
- metapost_command=config.value("Tools/Metapost","\"/usr/local/teTeX/bin/powerpc-apple-darwin-current/mpost\" --interaction nonstopmode ").toString();
- #else
+--- texmaker.cpp 2006-12-22 15:36:59.000000000 -0500
++++ texmaker.cpp.new 2007-01-03 02:04:18.000000000 -0500
+@@ -2016,17 +2016,17 @@
+ #endif
+ #ifdef Q_WS_X11
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();
-@@ -1871,9 +1871,9 @@
- ghostscript_command=config.value("Tools/Ghostscript","\"C:/Program Files/gs/gs8.54/bin/gswin32c.exe\"").toString();
- #endif
- #ifdef Q_WS_X11
+ pdflatex_command=config.value("Tools/Pdflatex","pdflatex -interaction=nonstopmode %.tex").toString();
+ dvipdf_command=config.value("Tools/Dvipdf","dvipdfm %.dvi").toString();
+ 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","evince %.dvi").toString();
+ // kdvi "file:%.dvi#src:@ %.tex"
-viewps_command=config.value("Tools/Ps","gv %.ps").toString();
-viewpdf_command=config.value("Tools/Pdf","xpdf %.pdf").toString();
-+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();
ghostscript_command=config.value("Tools/Ghostscript","gs").toString();
#endif
- #ifdef Q_WS_MACX
+ userquick_command=config.value("Tools/Userquick","latex -interaction=nonstopmode %.tex|bibtex %.aux|latex -interaction=nonstopmode %.tex|latex -interaction=nonstopmode %.tex|xdvi %.dvi").toString();
Index: texmaker.spec
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- texmaker.spec 5 Sep 2006 18:03:07 -0000 1.11
+++ texmaker.spec 3 Jan 2007 07:25:49 -0000 1.12
@@ -1,7 +1,7 @@
Summary: LaTeX editor
Name: texmaker
-Version: 1.4
-Release: 1%{?dist}.2
+Version: 1.5
+Release: 1%{?dist}
Epoch: 1
License: GPL
Group: Applications/Publishing
@@ -16,8 +16,6 @@
Patch0: %{name}-desktop.patch
# Patch to use default Fedora's document viewer
Patch1: %{name}-tools.patch
-# Patch to (temporarily) resolve build issue with qt-4.2
-#Patch2: %{name}-qt42.patch
%description
Texmaker is a program, that integrates many tools needed to develop
@@ -29,13 +27,12 @@
%setup -q
%patch0 -p0 -b .desktop
%patch1 -p0 -b .tools
-#%patch2 -p0 -b .qt42
%build
export QTDIR=%{_libdir}/qt4
qmake-qt4 -unix texmaker.pro
-make %{?_smp_mflags} INSTALL_ROOT=%{buildroot}
+make %{?_smp_mflags}
%install
rm -rf %{buildroot}
@@ -51,10 +48,9 @@
# Don't package these twice
rm -rf %{buildroot}%{_datadir}/%{name}/{AUTHORS,COPYING,*.desktop,tex*.png}
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor fedora \
--dir %buildroot%_datadir/applications \
- --add-category Office \
- --add-category X-Fedora \
+ --remove-category Publishing \
utilities/texmaker.desktop
%post
@@ -86,11 +82,8 @@
%{_datadir}/icons/hicolor/*/apps/texmaker.png
%changelog
-* Tue Sep 05 2006 Deji Akingunola <dakingun at gmail.com> - 1.4-1
-- qmake4 has now changed to qmake-qt4
-
-* Wed Aug 30 2006 Deji Akingunola <dakingun at gmail.com> - 1.4-1
-- Oops, forgotten FE-5 doesn't have qt4-4.2 yet, drop qt-4.2 patch
+* Tue Jan 02 2007 Deji Akingunola <dakingun at gmail.com> - 1.5-1
+- New release
* Tue Aug 29 2006 Deji Akingunola <dakingun at gmail.com> - 1.4-1
- Update to 1.4
--- texmaker-qt42.patch DELETED ---
More information about the scm-commits
mailing list