rpms/octave-forge/devel octave-forge-20071212-parallel.patch, 1.1, 1.2 octave-forge.spec, 1.47, 1.48

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge-20071212-parallel.patch octave-forge.spec 
Log Message:
Modify the patch. Hopefully this one fixes it.

octave-forge-20071212-parallel.patch:

Index: octave-forge-20071212-parallel.patch
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge-20071212-parallel.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- octave-forge-20071212-parallel.patch	20 Dec 2007 17:19:14 -0000	1.1
+++ octave-forge-20071212-parallel.patch	20 Dec 2007 19:16:23 -0000	1.2
@@ -1,16 +1,19 @@
 --- 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 @@
+@@ -99,9 +99,11 @@
  %.mex : %.o ; $(MKMEXFILE) $^ -o $@
- 
- 
+ %.o : %.cc ; $(MKOCTFILE) -c $< -o $@
+
 -all : $(EXTERNALDIRS) $(SOLVEROCTFILE) $(ODEPKGOBJECTS) $(ODEPKGMXFILES)
 +all :
 +	@$(MAKE) $(EXTERNALDIRS)
 +	@$(MAKE) $(SOLVEROCTFILE) $(ODEPKGOBJECTS) $(ODEPKGMXFILES)
 
- $(SOLVEROCTFILE) : $(EXTERNALDIRS) $(SOLVEROBJECTS)
+-$(SOLVEROCTFILE) : $(EXTERNALDIRS) $(SOLVEROBJECTS)
++$(SOLVEROCTFILE) : $(SOLVEROBJECTS)
  	$(MKOCTFILE) $(SOLVEROBJECTS) -o $(SOLVEROCTFILE)
+
+ $(DOPRI5MXFILES) : $(DOPRI5OBJECTS)
 --- 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 @@


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- octave-forge.spec	20 Dec 2007 17:19:14 -0000	1.47
+++ octave-forge.spec	20 Dec 2007 19:16:23 -0000	1.48
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20071212
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -212,6 +212,9 @@
 
 
 %changelog
+* Thu Dec 20 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-3
+- Try the patch again.
+
 * Thu Dec 20 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-2
 - Add patch to fix parallel build of odepkg and optiminterp (again).