rpms/octave-forge/devel octave-forge-20071014-time.patch, NONE, 1.1 octave-forge.spec, 1.41, 1.42

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-20071014-time.patch 
Log Message:
Rebuild for octave-2.9.16 with new patch.

octave-forge-20071014-time.patch:

--- NEW FILE octave-forge-20071014-time.patch ---
Index: listen.cc
===================================================================
--- octave-forge-bundle-20071014/main/miscellaneous-1.0.3/src/listen.cc	(revision 4170)
+++ octave-forge-bundle-20071014/main/miscellaneous-1.0.3/src/listen.cc	(working copy)
@@ -33,8 +33,8 @@
 static char* context = NULL;
 
 static double timestamp = 0.0;
-inline void tic(void) { timestamp = octave_time(); }
-inline double toc(void) {return ceil(-1e6*(timestamp-double(octave_time())));}
+inline void tic(void) { timestamp = octave_time().double_value(); }
+inline double toc(void) {return ceil(-1e6*(timestamp-octave_time().double_value()));}
 
 // XXX FIXME XXX --- surely this is part of the standard library?
 void


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- octave-forge.spec	17 Oct 2007 13:33:11 -0000	1.41
+++ octave-forge.spec	7 Nov 2007 22:41:42 -0000	1.42
@@ -2,7 +2,7 @@
 
 Name:           octave-forge
 Version:        20071014
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -18,6 +18,7 @@
 ## rm -Rf octave-forge-bundle-%{version}
 Source0:        %{name}-bundle-%{version}.patched.tar.gz
 Patch0:         octave-forge-20071014-parallel.patch
+Patch1:         octave-forge-20071014-time.patch
 buIldRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave(api) = %{octave_api} ImageMagick
@@ -122,7 +123,8 @@
 done
 
 #Patches
-%patch -p1 -b .parallel
+%patch0 -p1 -b .parallel
+%patch1 -p1 -b .time
 
 #Cleanup some CVS directories
 find -name CVS | xargs rm -rf
@@ -212,6 +214,9 @@
 
 
 %changelog
+* Wed Nov  7 2007 Quentin Spencer <qspencer at users.sf.net> 20071014-3
+- Add new patch to listen.cc for compatibility with octave-2.9.16
+
 * Tue Oct 16 2007 Orion Poplawski <orion at cora.nwra.com>  20071014-2
 - Add patch to fix parallel build of odepkg and optiminterp