rpms/octave-forge/FC-5 octave-forge-2006.03.17-zplane.patch, NONE, 1.1 octave-forge.spec, 1.22, 1.23
Quentin Spencer (qspencer)
fedora-extras-commits at redhat.com
Wed May 3 15:44:07 UTC 2006
Author: qspencer
Update of /cvs/extras/rpms/octave-forge/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16283
Modified Files:
octave-forge.spec
Added Files:
octave-forge-2006.03.17-zplane.patch
Log Message:
Fix octcdf. Bug fix for #190481
octave-forge-2006.03.17-zplane.patch:
--- NEW FILE octave-forge-2006.03.17-zplane.patch ---
Index: main/signal/zplane.m
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/signal/zplane.m,v
retrieving revision 1.4
diff -u -r1.4 zplane.m
--- main/signal/zplane.m 7 Jan 2006 05:23:27 -0000 1.4
+++ main/signal/zplane.m 3 May 2006 15:37:01 -0000
@@ -83,9 +83,12 @@
catch eleo = 0; end; ##<oct
try wele = warn_empty_list_elements; ##<oct
catch wele = 0; end; ##<oct
+ try ar = automatic_replot;
+ catch ar = 1; end
unwind_protect ##<oct
empty_list_elements_ok = 1; ##<oct
warn_empty_list_elements = 0; ##<oct
+ automatic_replot = 0;
xmin = min([-1; real(z(:)); real(p(:))]);
xmax = max([ 1; real(z(:)); real(p(:))]);
@@ -109,7 +112,8 @@
text();
plot_with_labels(z, "o");
plot_with_labels(p, "x");
-
+ replot;
+
unwind_protect_cleanup ##<oct
empty_list_elements_ok = eleo; ##<oct
warn_empty_list_elements = wele; ##<oct
@@ -118,6 +122,7 @@
axis(); ##<oct
__gnuplot_set__ pointsize 1 ##<oct
axis('normal'); ##<oct
+ automatic_replot = ar;
end_unwind_protect ##<oct
##<mat r = exp(2i*pi*[0:100]/100);
##<mat plot(real(r), imag(r),'k'); hold on;
Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- octave-forge.spec 20 Apr 2006 13:51:53 -0000 1.22
+++ octave-forge.spec 3 May 2006 15:44:07 -0000 1.23
@@ -1,6 +1,6 @@
Name: octave-forge
Version: 2006.03.17
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Contributed functions for octave
Group: Applications/Engineering
@@ -16,12 +16,15 @@
## 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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: octave >= 2.9.5 ImageMagick
BuildRequires: octave-devel tetex gcc-gfortran ginac-devel qhull-devel
-BuildRequires: ImageMagick-c++-devel netcdf-devel pcre-devel gsl-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
@@ -34,11 +37,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
%build
-export CPPFLAGS=-I%{_includedir}/netcdf-3
+./autogen.sh
%configure
make %{?_smp_mflags}
@@ -69,6 +75,11 @@
%changelog
+* Wed May 3 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-3
+- Add fixes for octcdf (from the author), which changes the dependency
+ from netcdf to libnc-dap. (This requires autoconf temporarily.)
+- Bug fix for #190481
+
* Thu Apr 20 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-2
- Add patch for system function so it works with octave 2.9.5.
More information about the fedora-extras-commits
mailing list