rpms/texmaker/FC-5 texmaker.spec,1.9,1.10

[Deji Akingunola (deji)]

Author: deji

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

Modified Files:
	texmaker.spec 
Log Message:
* 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



Index: texmaker.spec
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-5/texmaker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- texmaker.spec	30 Aug 2006 07:05:37 -0000	1.9
+++ texmaker.spec	30 Aug 2006 07:15:55 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: LaTeX editor
 Name: texmaker
 Version: 1.4
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Epoch: 1
 License: GPL
 Group: Applications/Publishing
@@ -17,7 +17,7 @@
 # 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
+#Patch2: %{name}-qt42.patch
 
 %description
 Texmaker is a program, that integrates many tools needed to develop 
@@ -29,11 +29,11 @@
 %setup -q
 %patch0 -p0 -b .desktop
 %patch1 -p0 -b .tools
-%patch2 -p0 -b .qt42
+#%patch2 -p0 -b .qt42
  
 %build
 export QTDIR=%{_libdir}/qt4
-qmake-qt4 -unix texmaker.pro
+qmake4 -unix texmaker.pro
 
 make %{?_smp_mflags} INSTALL_ROOT=%{buildroot} 
 
@@ -86,6 +86,9 @@
 %{_datadir}/icons/hicolor/*/apps/texmaker.png
 
 %changelog
+* 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 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