[mathgl] * Disable octave due to build problems with SWIG (header & class dependency problems)

[mycae]

commit 39f9fd1eb1cac187261f99b83b2cf9a5a7bcc881
Author: D Haley <mycae at yahoo.com>
Date:   Sun Feb 27 20:38:41 2011 +0000

    * Disable octave due to build problems with SWIG (header & class dependency problems)

 mathgl.spec |   54 +++++++++---------------------------------------------
 1 files changed, 9 insertions(+), 45 deletions(-)
---
diff --git a/mathgl.spec b/mathgl.spec
index 9376e02..339f266 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -1,8 +1,9 @@
-%{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
 Name: mathgl
 Version: 1.11.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Cross-platform library for making high-quality scientific graphics
+#Deutsch ist fremdsprach für mich.
+#Summary(de): Plattformübergreifend bibliotheke für hoch-qualität Wissenschaftliche Graphiken
 Summary(ru): MathGL - это библиотека для осуществления высококачественной визуализации данных
 License: GPLv2+
 Group: Development/Libraries
@@ -22,7 +23,7 @@ BuildRequires: swig
 
 # optional packages
 BuildRequires: freeglut-devel hdf-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
-BuildRequires: wxGTK-devel giflib-devel octave-devel
+BuildRequires: wxGTK-devel giflib-devel 
 
 #For autoreconf (required for patches, libtool)
 BuildRequires:	autoconf
@@ -32,8 +33,6 @@ BuildRequires:	libtool
 Requires(post): info
 Requires(preun): info
 
-Requires: octave(api) = %{octave_api}
-
 %description
 Mathgl is a cross-platform library for making high-quality scientific
 graphics. It provides fast data plotting and handling of large data
@@ -92,7 +91,7 @@ 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
+		--enable-all
 
 #Force strip rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -109,41 +108,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 #Trash the .la files that get generated anyway (faulty configure? Doesn't appear up without --disable-ltdtl-install)
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 
-
-#Fix up octave .oct file install
-mkdir -p temp-octave
-
-pushd .
-cd temp-octave
-#Decompress tarballed "oct" file and remove tarball
-tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
-rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
-
-#Copy the .oct file and supporting files to octave packages dir
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.10.1/
-#Remove empty INDEX file
-rm %{name}/INDEX
-
-#Fix PKG_ADD 
-echo "pkg load mathgl" > %{name}/PKG_ADD
-echo "mathgl;" >> %{name}/PKG_ADD
-
-#fix wrong version number in 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.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.11.0/packinfo
-cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.11.0/packinfo
-
-popd
-
-
-
 pushd .
 #Lets build a "docs" dir to maintain the dir relationships needed for html files
 mkdir -p  texinfo/docs
@@ -177,7 +141,6 @@ popd
 %post 
 /sbin/ldconfig
 /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-octave -q -H --no-site-file --eval "pkg('rebuild');"
 
 %preun
 if [ $1 = 0 ] ; then
@@ -186,7 +149,6 @@ fi
 
 %postun
 /sbin/ldconfig
-octave -q -H --no-site-file --eval "pkg('rebuild');"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -198,8 +160,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 %{_bindir}/mgl*
 %{_datadir}/%{name}/
-%{_prefix}/libexec/octave/packages/%{name}-1.11.0/
-%{_datadir}/octave/packages/%{name}-1.11.0/
 %{_infodir}/%{name}.*.gz
 %{_infodir}/%{name}_ru.*.gz
 
@@ -214,6 +174,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc texinfo/docs/*
 
 %changelog
+* Sun Feb 27 2011 <mycae(a!t)yahoo.com> - 1.11.0.1-3
+- Remove octave for Bug 679948, and dynamic patch non-functional due
+  to swig covariant return type problems with octave_map
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild