[mathgl] * Update to 1.11.0, with build

[mycae]

commit b8b8f2140102aa5d03b0570173734393d730f343
Author: D Haley <mycae at yahoo.com>
Date:   Sun Nov 28 00:46:54 2010 +0000

    * Update to 1.11.0, with build

 mathgl.spec |   38 +++++++++++++++++---------------------
 1 files changed, 17 insertions(+), 21 deletions(-)
---
diff --git a/mathgl.spec b/mathgl.spec
index dc41dda..8508064 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -1,7 +1,7 @@
 %{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
 Name: mathgl
-Version: 1.10.2.1
-Release: 3%{?dist}
+Version: 1.11.0.1
+Release: 1%{?dist}
 Summary: Cross-platform library for making high-quality scientific graphics
 Summary(ru): MathGL - это библиотека для осуществления высококачественной визуализации данных
 License: GPLv2+
@@ -11,13 +11,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
 
 #Uncomment mathgl dif listing (fix warning) also from pts
 Patch0: %{name}-info.patch
-#Remove empty libmgl-wx from compilation
-Patch1: %{name}-no-mglwx.patch
-#Fix DSO linking in mglview util  & examples (linker flags) (2 and 3 reseectively)
-Patch2: %{name}-mglview-ldflags.patch
-Patch3: %{name}-examples-ldflags.patch
-#Remove missing file from install.
-Patch4: %{name}-novfm-fonts.patch
+#Datatype conversion (int->int32) on x86 in hdf4 read func
+Patch1: %{name}-hdf4-datatype.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +21,7 @@ BuildRequires: gsl-devel libpng-devel libtool-ltdl-devel libtool
 BuildRequires: swig 
 
 # optional packages
-BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
+BuildRequires: freeglut-devel hdf-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
 BuildRequires: wxGTK-devel giflib-devel octave-devel
 
 #For autoreconf (required for patches, libtool)
@@ -85,11 +80,7 @@ done
 
 %patch0
 %patch1
-%patch2
-%patch3
-%patch4
 
-autoreconf
 
 
 %build
@@ -98,6 +89,7 @@ QMAKE=/usr/bin/qmake-qt4
 LUPDATE=/usr/bin/lupdate-qt4
 LRELEASE=/usr/bin/lrelease-qt4
 
+export LDFLAGS="-L/usr/lib64/hdf/ -L/usr/lib/hdf"
 %configure	--disable-static \
 		--enable-shared \
 		--enable-all --enable-octave --disable-rpath
@@ -137,16 +129,16 @@ echo "pkg load mathgl" > %{name}/PKG_ADD
 echo "mathgl;" >> %{name}/PKG_ADD
 
 #fix wrong version number in description
-sed -i 's/1.9/1.10.1/'  %{name}/DESCRIPTION 
+sed -i 's/1.9/1.11.0.1/'  %{name}/DESCRIPTION 
 
 #We cannot use version macro with octave package search,
 # as pkg.m assumes a x.y.z format for packages. Failing
 # to do this renders the plugin inoperable
-cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.10.1/
+cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.11.0/
 
 #packinfo dir is required, or octave will not find the dir in recursive search
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.10.1/packinfo
-cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.10.1/packinfo
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.11.0/packinfo
+cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.11.0/packinfo
 
 popd
 
@@ -157,7 +149,6 @@ pushd .
 mkdir -p  texinfo/docs
 cd texinfo/docs/
 cp -pr ../mathgl_en.html .
-cp -pr ../png_static .
 cp -pr ../png/ .
 
 #remove zero length faux PNG file
@@ -179,6 +170,8 @@ do
 	mv $i `echo $i | sed s/mathgl_en/mathgl/`
 done
 
+rm mgl_*.info*
+
 popd
 
 %post 
@@ -205,8 +198,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %{_bindir}/mgl*
 %{_datadir}/%{name}/
-%{_prefix}/libexec/octave/packages/%{name}-1.10.1/
-%{_datadir}/octave/packages/%{name}-1.10.1/
+%{_prefix}/libexec/octave/packages/%{name}-1.11.0/
+%{_datadir}/octave/packages/%{name}-1.11.0/
 %{_infodir}/%{name}.*.gz
 %{_infodir}/%{name}_ru.*.gz
 
@@ -221,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc texinfo/docs/*
 
 %changelog
+* Sat Nov 27 2010 <mycae(a!t)yahoo.com> - 1.11.0.1-1
+- Update to 1.11.0.1
+
 * Sun Aug 08 2010 <mycae(a!t)yahoo.com> - 1.10.2.1-3
 - Add gsl-devel to requires