rpms/octave-forge/devel octave-forge-20090607-vrml-build.patch, NONE, 1.1 octave-forge.spec, 1.83, 1.84

[alexlan]

Author: alexlan

Update of /cvs/pkgs/rpms/octave-forge/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29820

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20090607-vrml-build.patch 
Log Message:
* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-12
- Add patch from upstream SVN (r6073) for 'vrml'
- Disable 'fixed' package again, patch fixed the build but fails at
  install-time on i686 probably for similar reasons java- fails to
  install


octave-forge-20090607-vrml-build.patch:
 vrml_text.m    |    2 +-
 vrml_transfo.m |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE octave-forge-20090607-vrml-build.patch ---
--- main/vrml-1.0.10/inst/vrml_text.m	2009/08/02 21:17:03	6072
+++ main/vrml-1.0.10/inst/vrml_text.m	2009/08/04 05:01:52	6073
@@ -46,7 +46,7 @@
 
   df = tars (col, size, family, justify, style, verbose);
 
-  s = read_options (varargin{:}, "op1",op1,"op0",op0, "default",df);
+  s = read_options (varargin, "op1",op1,"op0",op0, "default",df);
   col=       s.col;
   size=      s.size;
   family=    s.family;
--- main/vrml-1.0.10/inst/vrml_transfo.m	2009/08/02 21:17:03	6072
+++ main/vrml-1.0.10/inst/vrml_transfo.m	2009/08/04 05:01:52	6073
@@ -57,7 +57,7 @@
 if prod(size(c))==1, c = [c;c;c]; end
 
 if all(size(r) == 3)
-  if abs (det (r) - 1) > sqrt (eps), r2 = orthogonalize (r);
+  if abs (det (r) - 1) > sqrt (eps), r2 = orth (r);
   else                               r2 = r;
   end
   [axis,ang] = rotparams (r2);


Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- octave-forge.spec	31 Aug 2009 10:15:24 -0000	1.83
+++ octave-forge.spec	31 Aug 2009 11:06:35 -0000	1.84
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -21,6 +21,7 @@ Patch0:		octave-forge-20090607-ann-swig-
 Patch1:		octave-forge-20090607-parallel-build.patch
 Patch2:		octave-forge-20090607-java-build.patch
 Patch3:		octave-forge-20090607-fixed-build.patch
+Patch4:		octave-forge-20090607-vrml-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel >= 6:3.0.0-1
@@ -145,8 +146,8 @@ rm extra/windows-*.tar.gz
 rm main/database-*.tar.gz
 # 6. exclude ftp -- SWIG wrappers are broken
 rm main/ftp-*.tar.gz
-# 7. exclude parallel -- not yet ported to build against Octave 3.2
-#rm main/parallel-*.tar.gz
+# 7. exclude fixed --  doesn't build against Octave 3.2
+rm main/fixed-*.tar.gz
 # 8. exclude graceplot --  doesn't build against Octave 3.2
 rm extra/graceplot-*.tar.gz
 # 9. exclude java --  doesn't build against Octave 3.2
@@ -173,7 +174,8 @@ done
 %patch1 -p0
 #disable patch for the moment, not building 'java'
 #patch2 -p0
-%patch3 -p0
+#patch3 -p0
+%patch4 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -247,6 +249,12 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-12
+- Add patch from upstream SVN (r6073) for 'vrml'
+- Disable 'fixed' package again, patch fixed the build but fails at
+  install-time on i686 probably for similar reasons java- fails to
+  install
+
 * Mon Aug 31 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-11
 - Fixed shell globbing in build and install sections that missed
   packages with subminor versions (thanks Dmitri Sergatskov)