rpms/octave-forge/devel octave-forge.spec,1.74,1.75

[alexlan]

Author: alexlan

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

Modified Files:
	octave-forge.spec 
Log Message:
* Wed Aug 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-5
- Disable 'parallel' and associated patches temporarily just to get
  the whole thing to build and fix broken deps (upstream working on
  it)



Index: octave-forge.spec
===================================================================
RCS file: /cvs/pkgs/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- octave-forge.spec	20 Aug 2009 02:23:00 -0000	1.74
+++ octave-forge.spec	20 Aug 2009 02:51:07 -0000	1.75
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20090607
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -65,7 +65,8 @@ Provides: octave-odepkg = 0.6.7
 Provides: octave-optim = 1.0.6
 Provides: octave-optiminterp = 0.3.2
 Provides: octave-outliers = 0.13.9
-Provides: octave-parallel = 2.0.1
+# temporarily disable: still not yet ported to Octave 3.2.x
+# Provides: octave-parallel = 2.0.1
 Provides: octave-physicalconstants = 0.1.7
 Provides: octave-plot = 1.0.7
 Provides: octave-quaternion = 1.0.0
@@ -141,6 +142,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
 
 #Unpack everything
 for pkg in main extra language
@@ -157,9 +160,11 @@ do
 done
 
 #apply patches
-%patch0 -p0
+#disable patch for the moment, not building 'parallel'
+#patch0 -p0
 %patch1 -p0
-%patch2 -p0
+#disable patch for the moment, not building 'parallel'
+#patch2 -p0
 
 #Install with -nodeps
 sed -i -e "s/pkg('install',/pkg('install','-nodeps',/" */*/Makefile
@@ -233,6 +238,11 @@ octave -q -H --no-site-file --eval "pkg(
 
 
 %changelog
+* Wed Aug 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-5
+- Disable 'parallel' and associated patches temporarily just to get
+  the whole thing to build and fix broken deps (upstream working on
+  it)
+
 * Wed Aug 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 20090607-4
 - Add patch from SVN upstream (r6116) to fix build of parallel package
   (bump version of package to 2.0.1)