rpms/octave-forge/devel octave-forge.spec, 1.48, 1.49 octave-forge-20071212-parallel.patch, 1.2, NONE

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge.spec 
Removed Files:
	octave-forge-20071212-parallel.patch 
Log Message:
I give up. Disable parallel build completely for now.


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- octave-forge.spec	20 Dec 2007 19:16:23 -0000	1.48
+++ octave-forge.spec	20 Dec 2007 20:59:47 -0000	1.49
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20071212
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -17,7 +17,6 @@
 ## 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
@@ -121,9 +120,6 @@
    cd ..
 done
 
-#Patches
-%patch0 -p1 -b .parallel
-
 #Cleanup some CVS directories
 find -name CVS | xargs rm -rf
 
@@ -157,11 +153,11 @@
       fi
       if [ -f Makefile ]
       then
-         make %{?_smp_mflags} TMPDIR=%{_tmppath}
+         make TMPDIR=%{_tmppath}
       elif [ -f src/Makefile ]
       then
          cd src
-         make %{?_smp_mflags} TMPDIR=%{_tmppath}
+         make TMPDIR=%{_tmppath}
          cd ..
       fi
       cd ..
@@ -212,6 +208,9 @@
 
 
 %changelog
+* Thu Dec 20 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-4
+- I give up. Disable parallel build.
+
 * Thu Dec 20 2007 Quentin Spencer <qspencer at users.sf.net> 20071212-3
 - Try the patch again.
 


--- octave-forge-20071212-parallel.patch DELETED ---