rpms/texmaker/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 texmaker-desktop.patch, 1.1, 1.2 texmaker-tools.patch, 1.1, 1.2 texmaker.spec, 1.2, 1.3 texmaker-install.patch, 1.1, NONE
Deji Akingunola (deji)
fedora-extras-commits at redhat.com
Thu May 25 19:04:38 UTC 2006
Author: deji
Update of /cvs/extras/rpms/texmaker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31654/FC-4
Modified Files:
.cvsignore sources texmaker-desktop.patch texmaker-tools.patch
texmaker.spec
Removed Files:
texmaker-install.patch
Log Message:
auto-import texmaker-1.3-1 on branch FC-4 from texmaker-1.3-1.src.rpm
import version 1.3 update
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 28 Oct 2005 16:32:27 -0000 1.2
+++ .cvsignore 25 May 2006 19:04:38 -0000 1.3
@@ -1 +1 @@
-texmaker-1.12.tar.bz2
+texmaker-1.3.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 28 Oct 2005 16:32:27 -0000 1.2
+++ sources 25 May 2006 19:04:38 -0000 1.3
@@ -1 +1 @@
-af243a0506a296216b51aad80b244c63 texmaker-1.12.tar.bz2
+17f91175a32827e9c9f45dc7a20a0c2b texmaker-1.3.tar.bz2
texmaker-desktop.patch:
Index: texmaker-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- texmaker-desktop.patch 28 Oct 2005 16:32:27 -0000 1.1
+++ texmaker-desktop.patch 25 May 2006 19:04:38 -0000 1.2
@@ -1,12 +1,12 @@
--- 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,15 @@
+@@ -1,20 +1,16 @@
[Desktop Entry]
--Categories=Qt;KDE;Publishing;
+-Categories=Application;Utility;TextEditor;Publishing;
-Comment=
-Comment[fr]=
-DocPath=
-+Categories=Application;Publishing;Qt;
++Categories=Application;Utility;TextEditor;Publishing;Qt;
Encoding=UTF-8
Exec=texmaker
GenericName=LaTeX Editor
@@ -14,15 +14,13 @@
Icon=texmaker
MimeType=text/x-tex
-MiniIcon=texmaker
--Name=Texmaker
--Name[fr]=Texmaker
+X-KDE-StartupNotify=true
-+Name=Texmaker LaTeX Editor
-+Name[fr]=Texmaker Editeur LaTeX
+ Name=Texmaker
+ Name[fr]=Texmaker
Path=
-StartupNotify=false
+StartupNotify=true
Terminal=false
-TerminalOptions=
Type=Application
--
+
texmaker-tools.patch:
Index: texmaker-tools.patch
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker-tools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- texmaker-tools.patch 28 Oct 2005 16:32:27 -0000 1.1
+++ texmaker-tools.patch 25 May 2006 19:04:38 -0000 1.2
@@ -1,13 +1,24 @@
--- texmaker.cpp 2005-04-24 17:40:58.000000000 -0400
+++ texmaker.cpp.new 2005-10-27 13:25:15.000000000 -0400
-@@ -4033,8 +4033,8 @@
+@@ -1759,7 +1759,7 @@
+ metapost_command=config.value("Tools/Metapost","\"/usr/local/teTeX/bin/powerpc-apple-darwin-current/mpost\" --interaction nonstopmode ").toString();
+ #else
+ 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();
+@@ -1778,9 +1778,9 @@
+ viewpdf_command=config.value("Tools/Pdf","\"C:/Program Files/Adobe/Acrobat 7.0/Reader/AcroRd32.exe\" %.pdf").toString();
#endif
#ifdef Q_WS_X11
- viewdvi_command=config.readEntry("/Tools/Dvi","xdvi %.dvi");
--viewps_command=config.readEntry("/Tools/Ps","gv %.ps");
--viewpdf_command=config.readEntry("/Tools/Pdf","xpdf %.pdf");
-+viewps_command=config.readEntry("/Tools/Ps","evince %.ps");
-+viewpdf_command=config.readEntry("/Tools/Pdf","evince %.pdf");
+-viewdvi_command=config.value("Tools/Dvi","xdvi %.dvi").toString();
+-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();
#endif
#ifdef Q_WS_MACX
- viewdvi_command=config.readEntry("/Tools/Dvi","/Applications/Preview.app/Contents/MacOS/Preview %.dvi");
+ viewdvi_command=config.value("Tools/Dvi","open %.dvi").toString();
Index: texmaker.spec
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-4/texmaker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- texmaker.spec 28 Oct 2005 17:29:24 -0000 1.2
+++ texmaker.spec 25 May 2006 19:04:38 -0000 1.3
@@ -1,20 +1,21 @@
Summary: LaTeX editor
Name: texmaker
-Version: 1.12
-Release: 3%{?dist}
+Version: 1.3
+Release: 1%{?dist}
+Epoch: 1
License: GPL
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: qt-devel
+BuildRequires: qt4-devel
BuildRequires: desktop-file-utils
+Requires: tetex-latex, tetex-dvipost
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Patch0: %{name}-desktop.patch
-Patch1: %{name}-install.patch
# Patch to use default Fedora's document viewer
-Patch2: %{name}-tools.patch
+Patch1: %{name}-tools.patch
%description
Texmaker is a program, that integrates many tools needed to develop
@@ -24,14 +25,12 @@
%prep
%setup -q
-%patch0 -p0 -b .desktop
-%patch1 -p0 -b .install
-%patch2 -p0 -b .tools
+%patch0 -p0 -b .install
+%patch1 -p0 -b .tools
%build
-unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-${QTDIR}/bin/qmake -makefile -unix texmaker.pro
+export QTDIR=%{_libdir}/qt4
+qmake4 -unix PREFIX=%{buildroot}%{_prefix} texmaker.pro
make %{?_smp_mflags}
@@ -78,12 +77,20 @@
%files
%defattr(-, root, root, -)
%doc utilities/AUTHORS utilities/COPYING
-%_bindir/texmaker
+%{_bindir}/texmaker
%{_datadir}/texmaker/
%{_datadir}/applications/fedora-texmaker.desktop
%{_datadir}/icons/hicolor/*/apps/texmaker.png
%changelog
+* Thu May 25 2006 Deji Akingunola <dakingun at gmail.com> - 1.3-1
+- Updated to 1.3 - had to add epoch to facilitate an upgrade
+- New version depends on qt4
+- Explicitly add tetex-dvips Requires
+
+* Mon Feb 13 2006 Deji Akingunola <dakingun at gmail.com> - 1.12-4
+- Rebuild for Fedora Extras 5
+
* Fri Oct 28 2005 Deji Akingunola <dakingun at gmail.com> - 1.12-3
- Buildrequires qt-devel instead of kdelibs-devel
- Fix typos in desktop file patch
--- texmaker-install.patch DELETED ---
More information about the fedora-extras-commits
mailing list