rpms/texmaker/FC-5 texmaker-qt42.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 texmaker-tools.patch, 1.2, 1.3 texmaker.spec, 1.8, 1.9

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/texmaker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24292/FC-5

Modified Files:
	.cvsignore sources texmaker-tools.patch texmaker.spec 
Added Files:
	texmaker-qt42.patch 
Log Message:
auto-import texmaker-1.4-1 on branch FC-5 from texmaker-1.4-1.src.rpm

texmaker-qt42.patch:

--- NEW FILE texmaker-qt42.patch ---
--- texmaker.pro.qt42	2006-02-14 13:00:46.000000000 -0600
+++ texmaker.pro	2006-08-28 13:39:28.000000000 -0500
@@ -13,7 +13,7 @@
 isEmpty( PREFIX ) {
     PREFIX=/usr
 }
-DEFINES += PREFIX=\"$${PREFIX}\"
+DEFINES += PREFIX=\\\"$${PREFIX}\\\"
 target.path = $${PREFIX}/bin
 INSTALLS = target
 utilities.path = $${PREFIX}/share/texmaker


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 May 2006 19:03:48 -0000	1.3
+++ .cvsignore	30 Aug 2006 07:05:37 -0000	1.4
@@ -1 +1 @@
-texmaker-1.3.tar.bz2
+texmaker-1.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 May 2006 19:03:48 -0000	1.3
+++ sources	30 Aug 2006 07:05:37 -0000	1.4
@@ -1 +1 @@
-17f91175a32827e9c9f45dc7a20a0c2b  texmaker-1.3.tar.bz2
+c0d2146c849e06e5ff2e0d409abff16b  texmaker-1.4.tar.bz2

texmaker-tools.patch:

Index: texmaker-tools.patch
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker-tools.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- texmaker-tools.patch	25 May 2006 19:03:48 -0000	1.2
+++ texmaker-tools.patch	30 Aug 2006 07:05:37 -0000	1.3
@@ -1,6 +1,6 @@
---- texmaker.cpp	2005-04-24 17:40:58.000000000 -0400
-+++ texmaker.cpp.new	2005-10-27 13:25:15.000000000 -0400
-@@ -1759,7 +1759,7 @@
+--- 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
  latex_command=config.value("Tools/Latex","latex -interaction=nonstopmode %.tex").toString();
@@ -9,8 +9,8 @@
  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();
+@@ -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
 -viewdvi_command=config.value("Tools/Dvi","xdvi %.dvi").toString();
@@ -19,6 +19,6 @@
 +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
- viewdvi_command=config.value("Tools/Dvi","open %.dvi").toString();


Index: texmaker.spec
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- texmaker.spec	14 Jun 2006 22:03:20 -0000	1.8
+++ texmaker.spec	30 Aug 2006 07:05:37 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: LaTeX editor
 Name: texmaker
-Version: 1.3
-Release: 5%{?dist}
+Version: 1.4
+Release: 1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Publishing
@@ -16,6 +16,8 @@
 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 
@@ -27,12 +29,13 @@
 %setup -q
 %patch0 -p0 -b .desktop
 %patch1 -p0 -b .tools
+%patch2 -p0 -b .qt42
  
 %build
 export QTDIR=%{_libdir}/qt4
-qmake4 -unix texmaker.pro
+qmake-qt4 -unix texmaker.pro
 
-make %{?_smp_mflags} INSTALL_ROOT=%{buildroot}
+make %{?_smp_mflags} INSTALL_ROOT=%{buildroot} 
 
 %install
 rm -rf %{buildroot}
@@ -83,17 +86,9 @@
 %{_datadir}/icons/hicolor/*/apps/texmaker.png
 
 %changelog
-* Thu Jun 08 2006 Deji Akingunola <dakingun at gmail.com> - 1.3-5
-- Fix bug #194587
-
-* Thu Jun 08 2006 Deji Akingunola <dakingun at gmail.com> - 1.3-4
-- Fix bug #193601
-
-* Wed May 31 2006 Deji Akingunola <dakingun at gmail.com> - 1.3-3
-- Revert bad change
-
-* Wed May 31 2006 Deji Akingunola <dakingun at gmail.com> - 1.3-2
-- This should have been a noarch package (#193601)
+* Tue Aug 29 2006 Deji Akingunola <dakingun at gmail.com> - 1.4-1
+- Update to 1.4
+- Add patch by Rex Dieter to enable build with qt4-4.2
 
 * 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