rpms/mathgl/EL-5 mathgl.spec,1.1,1.2

[mycae]

Author: mycae

Update of /cvs/pkgs/rpms/mathgl/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14846

Modified Files:
	mathgl.spec 
Log Message:
- Fix several build errors with epel



Index: mathgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mathgl/EL-5/mathgl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mathgl.spec	14 Sep 2009 10:45:37 -0000	1.1
+++ mathgl.spec	14 Sep 2009 12:20:40 -0000	1.2
@@ -10,19 +10,23 @@ Url: http://mathgl.sourceforge.net
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 
 #Fix missing default parameter in hdf5 code 
-Patch0: %{name}-io.patch
+#Patch0: %{name}-io.patch
 #Patch to fix parallel build issue (from debian pts)
 Patch1: %{name}-png.patch
 #Uncomment mathgl dif listing (fix warning) also from pts
 Patch2: %{name}-info.patch
 #Remove empty libmgl-wx from compilation
 Patch3: %{name}-no-mglwx.patch
+#Allow autoconf 2.59 to work
+Patch4: %{name}-allow-autoconf-2p59.patch
+#disable texi2html (which crashes)
+Patch5: %{name}-disable-texinfo-html.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # mandatory packages
 BuildRequires: gsl-devel libpng-devel libtool-ltdl-devel libtool 
-BuildRequires: swig 
+#BuildRequires: swig 
 
 # optional packages
 BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
@@ -80,23 +84,27 @@ for file in AUTHORS ChangeLog.txt README
 	mv $file.new $file
 done
 
-%patch0
+#%patch0
 %patch1
 %patch2
 %patch3
 
+#EPEL specific patches
+%patch4
+%patch5
+
 autoreconf
 
 
 %build
-#configure looks for * not *-qt4
-QMAKE=/usr/bin/qmake-qt4
-LUPDATE=/usr/bin/lupdate-qt4
-LRELEASE=/usr/bin/lrelease-qt4
+QMAKE=/usr/lib/qt4/bin/qmake
+LUPDATE=/usr/lib/qt4/bin/lupdate
+LRELEASE=/usr/lib/qt4/bin/lrelease
+PATH=$PATH:/usr/lib/qt4/bin/
 
 %configure	--disable-static \
 		--enable-shared \
-		--enable-all --enable-octave --disable-rpath
+		--enable-all --disable-rpath --with-qt=/usr/lib/qt4/
 
 #Force strip rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool