rpms/octave-forge/FC-4 octave-forge-2006.07.09-legend.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 octave-forge.spec, 1.24, 1.25 sources, 1.7, 1.8 octave-forge-2006.03.17-octcdf.patch, 1.1, NONE octave-forge-2006.03.17-zplane.patch, 1.1, NONE

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	.cvsignore octave-forge.spec sources 
Added Files:
	octave-forge-2006.07.09-legend.patch 
Removed Files:
	octave-forge-2006.03.17-octcdf.patch 
	octave-forge-2006.03.17-zplane.patch 
Log Message:
New upstream release. Remove old patches and add a new one.

octave-forge-2006.07.09-legend.patch:

--- NEW FILE octave-forge-2006.07.09-legend.patch ---
Index: main/plot/legend.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/plot/legend.m,v
retrieving revision 1.16
diff -u -r1.16 legend.m
--- main/plot/legend.m	14 Apr 2006 12:51:14 -0000	1.16
+++ main/plot/legend.m	11 Jul 2006 16:09:07 -0000
@@ -195,7 +195,8 @@
   shell_cmd=["grep \"^", gnuplot_command_plot, " \" '", tmpfilename, "' | ", \
              "sed -e 's/,/ , /g' -e 's/\"/ \" /g'", " | ", \
              "awk '", awk_prog, "'"];
-  [status, plot_cmd] = split(system(shell_cmd),"\n");
+  [status, output] = system(shell_cmd);
+  plot_cmd = split(output,"\n");
 
   # Remove state file and sync file
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	12 May 2006 18:35:05 -0000	1.7
+++ .cvsignore	13 Jul 2006 19:24:47 -0000	1.8
@@ -1,2 +1 @@
-octave-forge-2006.03.17.patched.tar.gz
-octave-forge-system.patch.gz
+octave-forge-2006.07.09.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- octave-forge.spec	12 May 2006 18:35:05 -0000	1.24
+++ octave-forge.spec	13 Jul 2006 19:24:47 -0000	1.25
@@ -1,12 +1,12 @@
 Name:           octave-forge
-Version:        2006.03.17
-Release:        3%{?dist}
+Version:        2006.07.09
+Release:        1%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
 License:        Public Domain
 URL:            http://octave.sourceforge.net
-## Source0:        ftp://download.sourceforge.net/pub/sourceforge/o/oc/octave/%{name}-%{version}.tar.gz
+## Source0:        http://umn.dl.sourceforge.net/sourceforge/octave/%{name}-%{version}.tar.gz
 ## The original sources contain a non-free tree of functions that are
 ## GPL incompatible. A patched version with the non-free sources removed
 ## is created as follows:
@@ -15,16 +15,13 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
-Patch0:         %{name}-system.patch.gz
-Patch1:         %{name}-2006.03.17-octcdf.patch
-Patch2:         %{name}-2006.03.17-zplane.patch
+Patch0:         octave-forge-2006.07.09-legend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       octave >= 2.9.5 ImageMagick
+Requires:	octave >= 2.9.6 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
-BuildRequires:  autoconf
 
 %description
 Octave-forge is a community project for collaborative development of
@@ -36,21 +33,14 @@
 
 %prep
 %setup -q
-%patch0 -p1
-# The following patch requires regenerating the configure script
-%patch1 -p0
-%patch2 -p0
-# The sparse matrix functions are in octave 2.9.x so don't install them
-touch main/sparse/NOINSTALL
+%patch0 -p0
 
 %build
-./autogen.sh
-%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-ALTPATHNAME=octave/site/octave-forge-alternative
+ALTPATHNAME=octave/site/octave-forge-alternatives
 HOSTTYPE=`octave-config -p CANONICAL_HOST_TYPE`
 %makeinstall \
   MPATH=$RPM_BUILD_ROOT`octave-config -p LOCALFCNFILEDIR`/octave-forge \
@@ -75,6 +65,9 @@
 
 
 %changelog
+* Thu Jul 13 2006 Quentin Spencer <qspencer at users.sf.net> 2006.07.09-1
+- New upstream release. Remove old patches and add one new one.
+
 * Fri May 12 2006 Quentin Spencer <qspencer at users.sf.net> 2001.03.17-3
 - Rebuild with various changes for octave-2.9.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 May 2006 18:35:05 -0000	1.7
+++ sources	13 Jul 2006 19:24:47 -0000	1.8
@@ -1,2 +1 @@
-a1e76ab52fb9894586d6a7a0dc15e603  octave-forge-2006.03.17.patched.tar.gz
-c50919d0790c7873a82c2da09d419142  octave-forge-system.patch.gz
+49efa08b2b68267d87173ffef8866485  octave-forge-2006.07.09.patched.tar.gz


--- octave-forge-2006.03.17-octcdf.patch DELETED ---


--- octave-forge-2006.03.17-zplane.patch DELETED ---