rpms/octave-forge/devel octave-forge-2006.03.17-octcdf.patch, NONE, 1.1 octave-forge.spec, 1.22, 1.23

[Quentin Spencer (qspencer)]

Author: qspencer

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

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-2006.03.17-octcdf.patch 
Log Message:
Add patch for octcdf and associated specfile changes.

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


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- octave-forge.spec	19 Apr 2006 21:21:07 -0000	1.22
+++ octave-forge.spec	28 Apr 2006 18:47:37 -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,14 @@
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
 Patch0:         %{name}-system.patch.gz
+Patch1:         %{name}-2006.03.17-octcdf.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 +36,13 @@
 %prep
 %setup -q
 %patch0 -p1
+# The following patch requires regenerating the configure script
+%patch1 -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 +73,10 @@
 
 
 %changelog
+* Thu Apr 27 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.)
+
 * Wed Apr 19 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-2
 - New release for octave 2.9.5.
 - Patch added for incompatibilities between octave 2.9.4 and 2.9.5.