packages: octave-forge/octave-forge.spec - 20090607 - fixed building with o...

[baggins]

Author: baggins                      Date: Wed Apr 21 15:32:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 20090607
- fixed building with octave 3.2.4
- removed non-building packages from extras

---- Files affected:
packages/octave-forge:
   octave-forge.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/octave-forge/octave-forge.spec
diff -u packages/octave-forge/octave-forge.spec:1.26 packages/octave-forge/octave-forge.spec:1.27
--- packages/octave-forge/octave-forge.spec:1.26	Wed Mar 25 18:40:24 2009
+++ packages/octave-forge/octave-forge.spec	Wed Apr 21 17:32:32 2010
@@ -6,14 +6,17 @@
 Summary:	Extensions for GNU Octave
 Summary(pl.UTF-8):	Rozszerzenia dla GNU Octave
 Name:		octave-forge
-Version:	20080831
+Version:	20090607
 Release:	1%{?with_nonfree:.nonfree}
 License:	GPL
 Group:		Applications/Math
 Source0:	http://dl.sourceforge.net/octave/%{name}-bundle-%{version}.tar.gz
-# Source0-md5:	680ea705eb7434e219eb4a3eaffd7fba
+# Source0-md5:	faf95ff58884cd29379015b70f57c745
 Patch0:		%{name}-postgresql.patch
 Patch1:		%{name}-mysql.patch
+Patch2:		%{name}-fixed.patch
+Patch3:		%{name}-png.patch
+Patch4:		%{name}-parallel.patch
 URL:		http://octave.sourceforge.net/
 BuildRequires:	GiNaC-devel
 BuildRequires:	ImageMagick-c++-devel
@@ -78,18 +81,27 @@
 	done
 	cd ..
 done
-
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+# will and must be regenerated by swig
+rm main/ann-*/src/ann/bindings/ann_wrap.cpp
+rm main/ftp-*/src/ftp_wrap.cpp
 # needs very old ffmpeg?
-rm -rf main/video-1.0.1
+#rm -r main/video-1.0.1
 # needs jogl, WTF is jogl? java sucks
-rm -rf extra/jhandles-0.3.4
+rm -r extra/jhandles-0.3.5
 # If someone really wants the pain, then uncomment stuff below
-rm -rf main/database-1.0.1
+rm -r main/database-1.0.4
 #patch0 -p1
 #patch1 -p1
 #cd main/database-1.0.1/src
 #./autogen.sh
 #rm mysql_wrap.cpp
+# does not build with octave 3.2.4
+rm -r extra/graceplot-1.0.8
+rm -r extra/java-1.2.6
 
 %build
 CFLAGS="%{rpmcflags} -I/usr/include/ncurses"; export CFLAGS
@@ -100,7 +112,7 @@
 		cd $pkg
 		if [ -e src/configure ]; then
 			cd src
-			%configure
+			%configure --with-swig
 			cd ..
 		fi
 		%{__make} -j1
@@ -144,6 +156,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/04/21 15:32:32  baggins
+- 20090607
+- fixed building with octave 3.2.4
+- removed non-building packages from extras
+
 Revision 1.26  2009/03/25 17:40:24  uzsolt
 - BR netcdf-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/octave-forge/octave-forge.spec?r1=1.26&r2=1.27&f=u