rpms/octave-forge/devel octave-forge-20071212-parallel.patch, NONE, 1.1 octave-forge.spec, 1.46, 1.47

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27856

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20071212-parallel.patch 
Log Message:
Fix broken parallel build for two of the packages.

octave-forge-20071212-parallel.patch:

--- NEW FILE octave-forge-20071212-parallel.patch ---
--- octave-forge-bundle-20071212/main/odepkg-0.3.6/src/Makefile.parallel	2007-10-16 20:45:12.000000000 -0600
+++ octave-forge-bundle-20071212/main/odepkg-0.3.6/src/Makefile	2007-10-16 20:46:02.000000000 -0600
@@ -99,7 +99,9 @@
 %.mex : %.o ; $(MKMEXFILE) $^ -o $@
 
 
-all : $(EXTERNALDIRS) $(SOLVEROCTFILE) $(ODEPKGOBJECTS) $(ODEPKGMXFILES)
+all :
+	@$(MAKE) $(EXTERNALDIRS)
+	@$(MAKE) $(SOLVEROCTFILE) $(ODEPKGOBJECTS) $(ODEPKGMXFILES)

 $(SOLVEROCTFILE) : $(EXTERNALDIRS) $(SOLVEROBJECTS)
 	$(MKOCTFILE) $(SOLVEROBJECTS) -o $(SOLVEROCTFILE)
--- octave-forge-bundle-20071212/main/optiminterp-0.2.5/src/Makefile.parallel	2007-10-16 22:57:12.000000000 -0600
+++ octave-forge-bundle-20071212/main/optiminterp-0.2.5/src/Makefile	2007-10-16 22:59:47.000000000 -0600
@@ -28,3 +28,6 @@
 
 clean:
 	rm -f *.o *.oct *~ *.mod
+
+#It really depends on the .mod, but this should work for deps
+optiminterp_wrapper.o: optimal_interpolation.o


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- octave-forge.spec	12 Dec 2007 22:06:30 -0000	1.46
+++ octave-forge.spec	20 Dec 2007 17:19:14 -0000	1.47
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20071212
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,6 +17,7 @@
 ## tar czf octave-forge-bundle-%{version}.patched.tar.gz octave-forge-bundle-%{version}
 ## rm -Rf octave-forge-bundle-%{version}
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
+Patch0:         octave-forge-20071212-parallel.patch
 buIldRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave(api) = %{octave_api} ImageMagick
@@ -120,6 +121,9 @@
    cd ..
 done
 
+#Patches
+%patch0 -p1 -b .parallel
+
 #Cleanup some CVS directories
 find -name CVS | xargs rm -rf
 
@@ -208,6 +212,9 @@
 
 
 %changelog
+* Thu Dec 20 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-2
+- Add patch to fix parallel build of odepkg and optiminterp (again).
+
 * Wed Dec 12 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-1
 - New release. Remove old patches that are now in sources.
 - Update package description (some functions mentioned are now in octave).