rpms/octave-forge/FC-4 octave-forge-2006.03.17-octcdf.patch, NONE, 1.1 octave-forge-2006.03.17-zplane.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave-forge.spec, 1.23, 1.24 sources, 1.6, 1.7

Quentin Spencer (qspencer) fedora-extras-commits at redhat.com
Fri May 12 18:35:06 UTC 2006 

Author: qspencer

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

Modified Files:
	.cvsignore octave-forge.spec sources 
Added Files:
	octave-forge-2006.03.17-octcdf.patch 
	octave-forge-2006.03.17-zplane.patch 
Log Message:
Updates for compilation with octave 2.9.5.

octave-forge-2006.03.17-octcdf.patch:

--- NEW FILE octave-forge-2006.03.17-octcdf.patch ---
Index: main/octcdf/Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/octcdf/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- main/octcdf/Makefile        19 Apr 2006 19:09:51 -0000      1.6
+++ main/octcdf/Makefile        28 Apr 2006 17:51:17 -0000
@@ -34,7 +34,7 @@
        RM = rm -f
 endif

-NCTARGET = ov-netcdf.oct
+NCTARGET = netcdf.oct

 NCSOURCES = ov-netcdf.cc ov-ncfile.cc ov-ncvar.cc ov-ncatt.cc ov-ncdim.cc
 OBJECTS = $(patsubst %.cc,%.o,$(NCSOURCES))
Index: main/octcdf/configure.add
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/octcdf/configure.add,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main/octcdf/configure.add	15 Dec 2005 22:13:52 -0000	1.2
+++ main/octcdf/configure.add	25 Apr 2006 16:35:01 -0000	1.3
@@ -11,34 +11,29 @@
     OCTCDF_LIBS="$LDFLAGS"
     OCTCDF_CFLAGS="$CPPFLAGS"
 
-        dnl checking for opendap support
+    dnl first checking for opendap support
 
-        AC_MSG_CHECKING([for nc-dap])
+    AC_MSG_CHECKING([for nc-dap])
 
-        if ncdap-config --version > /dev/null 2>&1; then
+    if ncdap-config --version > /dev/null 2>&1; then
+          AC_MSG_RESULT([yes])
           OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`"
           OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`"
-          HAVE_NCDAP=yes
-          AC_MSG_RESULT([yes])
-        else
-          HAVE_NCDAP=no
-          AC_MSG_RESULT([no])          
-        fi
-
 
-    dnl Checking if the NetCDF library exists. 
+          HAVE_NETCDF=yes
+    else
+          AC_MSG_RESULT([no])          
 
-    AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
+          dnl if no opendap, checking if the NetCDF library exists. 
 
-    if test $HAVE_NETCDF = yes ; then
-       OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
-    fi
+          AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
 
-    dnl if we don't have nc-dap then we have to check for netcdf.h
-    dnl otherwise it is already given by ncdap-config --cflags
+          if test $HAVE_NETCDF = yes ; then
+            OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
 
-    if test $HAVE_NCDAP = no ; then
-      AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
+            dnl we have the libraries, no we have also the headers?
+            AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
+          fi
     fi
 
     if test $HAVE_NETCDF = yes ; then

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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Mar 2006 16:25:24 -0000	1.6
+++ .cvsignore	12 May 2006 18:35:05 -0000	1.7
@@ -1 +1,2 @@
 octave-forge-2006.03.17.patched.tar.gz
+octave-forge-system.patch.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- octave-forge.spec	27 Mar 2006 20:39:26 -0000	1.23
+++ octave-forge.spec	12 May 2006 18:35:05 -0000	1.24
@@ -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
@@ -15,12 +15,16 @@
 ## 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       octave >= 2.1.69 ImageMagick
-BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel
-BuildRequires:  xorg-x11-devel libjpeg-devel libpng-devel pcre-devel
-BuildRequires:  ncurses-devel libtermcap-devel gsl-devel qhull-devel
+Requires:       octave >= 2.9.5 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
@@ -32,9 +36,15 @@
 
 %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
+./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -65,6 +75,9 @@
 
 
 %changelog
+* Fri May 12 2006 Quentin Spencer <qspencer at users.sf.net> 2001.03.17-3
+- Rebuild with various changes for octave-2.9.5
+
 * Mon Mar 27 2006 Quentin Spencer <qspencer at users.sf.net> 2001.03.17-2
 - Rebuild (apparently needed for new octave release, fixes bug #186964).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Mar 2006 16:25:24 -0000	1.6
+++ sources	12 May 2006 18:35:05 -0000	1.7
@@ -1 +1,2 @@
 a1e76ab52fb9894586d6a7a0dc15e603  octave-forge-2006.03.17.patched.tar.gz
+c50919d0790c7873a82c2da09d419142  octave-forge-system.patch.gz

More information about the fedora-extras-commits mailing list