rpms/octave-forge/FC-3 octave-forge-2004.11.16-legend.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 octave-forge.spec, 1.12, 1.13 sources, 1.4, 1.5 octave-forge-2005.06.13-legend.patch, 1.1, NONE octave-forge-2005.06.13-pcre.patch, 1.1, NONE

[Quentin Spencer (qspencer)]

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7468

Modified Files:
	.cvsignore octave-forge.spec sources 
Added Files:
	octave-forge-2004.11.16-legend.patch 
Removed Files:
	octave-forge-2005.06.13-legend.patch 
	octave-forge-2005.06.13-pcre.patch 
Log Message:
Revert to release 2004.11.16 for Fedora Core 3. The newer release that is
used in FC4 requires a newer version of octave.


octave-forge-2004.11.16-legend.patch:

--- NEW FILE octave-forge-2004.11.16-legend.patch ---
Index: legend.m
===================================================================
--- main/plot/legend.m.~1~      2005-06-22 10:07:34.000000000 -0500
+++ main/plot/legend.m  2005-06-22 10:12:19.000000000 -0500
@@ -185,4 +185,8 @@
     if (++attempt > 20) error("gnuplot is not responding"); endif
     usleep(1e5);
   end
+  # wait for the file to be non-empty
+  while (~stat(tmpfilename).size)
+    usleep(1e5);
+  end
   plot_cmd = split(system(shell_cmd),"\n");

   if (~length(deblank(plot_cmd(rows(plot_cmd), :))))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jun 2005 13:31:52 -0000	1.4
+++ .cvsignore	22 Jun 2005 15:28:49 -0000	1.5
@@ -1 +1 @@
-octave-forge-2005.06.13.patched.tar.gz
+octave-forge-2004.11.16.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-3/octave-forge.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- octave-forge.spec	22 Jun 2005 13:11:08 -0000	1.12
+++ octave-forge.spec	22 Jun 2005 15:28:49 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           octave-forge
-Version:        2005.06.13
-Release:        2%{?dist}
+Version:        2004.11.16
+Release:        8%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,8 +15,7 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
-Patch0:         %{name}-2005.06.13-pcre.patch
-Patch1:         %{name}-2005.06.13-legend.patch
+Patch0:         %{name}-2004.11.16-legend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -25,10 +24,9 @@
 %define octave_ep  %(rpm -q --qf '%%{epoch}' octave)
 %define octave_ver %(rpm -q --qf '%%{version}' octave)
 Requires:	octave = %{octave_ep}:%{octave_ver} ImageMagick
-BuildRequires:  octave-devel tetex gcc-g77 GiNaC-devel fftw3-devel
+BuildRequires:  octave octave-devel tetex gcc-g77 GiNaC-devel readline-devel
 BuildRequires:  xorg-x11-devel libjpeg-devel libpng-devel zlib-devel
 BuildRequires:  ncurses-devel libtermcap-devel gsl-devel qhull-devel
-BuildRequires:  pcre-devel octave readline-devel
 
 %description
 Octave-forge is a community project for collaborative development of
@@ -41,9 +39,11 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p0
 
 %build
+## This prevents compiling of the fixed-point toolbox, which fails with the
+## version of octave (2.1.57) included in FC3.
+touch main/fixed/NOINSTALL
 %configure
 make %{?_smp_mflags}
 
@@ -76,17 +76,11 @@
 
 
 %changelog
-* Wed Jun 22 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-2
-- Require readline-devel since FC-3 octave-devel package doesn't.
-
-* Mon Jun 20 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-1
-- New upstream release. Now requires pcre-devel to build.
+* Wed Jun 22 2005 Quentin Spencer <qspencer at users.sf.net> 2005.11.16-8
 - Corrected instructions on creating patched source tarball.
 - Remove explicit BuildRequires for c++ compiler and libs
   (not needed and causes build failure in the build system for x86_64).
 - Add patch for problem with main/plot/legend.m
-- Add fftw3-devel to BuildRequires.
-- Added patch for FC-3 (pcre.h is in a different place).
 - Require octave (FC-3 octave-devel package doesn't).
 
 * Sat Jun 11 2005 Quentin Spencer <qspencer at users.sf.net> 2004.11.16-7


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jun 2005 13:31:52 -0000	1.4
+++ sources	22 Jun 2005 15:28:49 -0000	1.5
@@ -1 +1 @@
-460aecb7aa96689901bd96a04e55fb40  octave-forge-2005.06.13.patched.tar.gz
+2ab466e8fe914709cd8548d52f84039c  octave-forge-2004.11.16.patched.tar.gz


--- octave-forge-2005.06.13-legend.patch DELETED ---


--- octave-forge-2005.06.13-pcre.patch DELETED ---