[octave-octcdf] Update to latest svn to fix build issues

Orion Poplawski orion at fedoraproject.org
Mon Jan 16 15:44:51 UTC 2012 

commit 1fc852d5203ac56307886966bf6acaa9475078b6
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Jan 16 08:44:49 2012 -0700

    Update to latest svn to fix build issues

 octave-octcdf-svn9526.patch |  179 +++++++++++++++++++++++++++++++++++++++++++
 octave-octcdf.spec          |    7 +-
 2 files changed, 184 insertions(+), 2 deletions(-)
---
diff --git a/octave-octcdf-svn9526.patch b/octave-octcdf-svn9526.patch
new file mode 100644
index 0000000..24627f8
--- /dev/null
+++ b/octave-octcdf-svn9526.patch
@@ -0,0 +1,179 @@
+diff -ru --exclude .svn octcdf/DESCRIPTION octcdf-trunk/DESCRIPTION
+--- octcdf/DESCRIPTION	2011-02-07 13:46:55.000000000 -0700
++++ octcdf-trunk/DESCRIPTION	2012-01-16 08:38:43.564266900 -0700
+@@ -1,11 +1,11 @@
+ Name: octcdf
+ Version: 1.1.2
+-Date: 2011-02-07
++Date: 2012-01-06
+ Author: Alexander Barth <barth.alexander at gmail.com>
+ Maintainer: Alexander Barth <barth.alexander at gmail.com>
+ Title: octcdf
+ Description: A NetCDF interface for octave
+-Depends: octave (>= 3.3.51)
++Depends: octave (>= 3.4.0)
+ Autoload: yes
+ BuildRequires: netcdf-devel
+ License: GPL version 2 or later
+Only in octcdf-trunk/inst: @ncatt
+Only in octcdf-trunk/inst: @ncdim
+Only in octcdf-trunk/inst: @ncfile
+Only in octcdf-trunk/inst: @ncvar
+diff -ru --exclude .svn octcdf/PKG_ADD octcdf-trunk/PKG_ADD
+--- octcdf/PKG_ADD	2009-11-19 02:54:08.000000000 -0700
++++ octcdf-trunk/PKG_ADD	2012-01-16 08:38:43.571266595 -0700
+@@ -1,32 +1,3 @@
+-
+-dispatch('close','ncclose','ncfile');
+-dispatch('redef','ncredef','ncfile');
+-dispatch('endef','endef','ncfile');
+-dispatch('sync','ncsync','ncfile');
+-
+-dispatch('var','ncvar','ncfile');
+-
+-dispatch('att','ncatt','ncfile');
+-dispatch('att','ncatt','ncvar');
+-
+-dispatch('dim','ncdim','ncfile');
+-dispatch('dim','ncdim','ncvar');
+-
+-dispatch('name','ncname','ncfile');
+-dispatch('name','ncname','ncvar');
+-dispatch('name','ncname','ncatt');
+-dispatch('name','ncname','ncdim');
+-
+-dispatch('datatype','ncdatatype','ncvar');
+-dispatch('datatype','ncdatatype','ncatt');
+-
+-dispatch('autoscale','ncautoscale','ncvar');
+-dispatch('autonan','ncautonan','ncvar');
+-dispatch('fillval','ncfillval','ncvar');
+-
+-dispatch('isrecord','ncisrecord','ncdim');
+-
+-
+ autoload ("ncclose", fullfile (fileparts (mfilename ("fullpath")), "netcdf.oct"));
+ autoload ("ncredef", fullfile (fileparts (mfilename ("fullpath")), "netcdf.oct"));
+ autoload ("ncenddef", fullfile (fileparts (mfilename ("fullpath")), "netcdf.oct"));
+Only in octcdf/src: autom4te.cache
+Only in octcdf/src: configure
+diff -ru --exclude .svn octcdf/src/Makefile octcdf-trunk/src/Makefile
+--- octcdf/src/Makefile	2009-02-19 13:58:12.000000000 -0700
++++ octcdf-trunk/src/Makefile	2012-01-16 08:38:43.204282537 -0700
+@@ -42,7 +42,7 @@
+ TARGETS = $(NCTARGET)
+ 
+ MOFLAGS = $(OCTCDF_CFLAGS)
+-MOLIBS = $(shell mkoctfile --print LIBS) $(OCTCDF_LIBS) 
++MOLIBS = $(OCTCDF_LIBS) 
+ 
+ #
+ # comment this line out if your octave installation does not have integer types.
+@@ -61,7 +61,7 @@
+ ov-netcdf.o ov-ncfile.o ov-ncvar.o  ov-ncatt.o  ov-ncdim.o: ov-netcdf.h ov-ncfile.h ov-ncvar.h  ov-ncatt.h ov-ncdim.h
+ 
+ $(NCTARGET) : $(OBJECTS)
+-	LIBS="$(MOLIBS)" $(MKOCTFILE) -o $@ $(MOFLAGS) $(OBJECTS)
++	$(MKOCTFILE) -o $@ $(MOFLAGS) $(OBJECTS) $(MOLIBS) 
+ 
+ %.o:%.cc
+ 	$(MKOCTFILE) -c $< $(MOFLAGS) $(DEFINES)
+diff -ru --exclude .svn octcdf/src/ov-ncatt.h octcdf-trunk/src/ov-ncatt.h
+--- octcdf/src/ov-ncatt.h	2010-04-27 06:22:50.000000000 -0600
++++ octcdf-trunk/src/ov-ncatt.h	2012-01-16 08:38:43.176283754 -0700
+@@ -69,8 +69,17 @@
+ 
+   ~octave_ncatt()  {
+ #   ifdef OV_NETCDF_VERBOSE
+-    octave_stdout << "destruct nca " << nca << " count " << nca->count << endl;
++    octave_stdout << "destruct nca " << nca  << endl;
+ #   endif
++
++    if (!nca) {
++      // nothing to do
++#     ifdef OV_NETCDF_VERBOSE
++      octave_stdout << "nca already NULL " << nca  << endl;
++#     endif
++      return;
++    }
++
+     nca->count--;
+ 
+     if (nca->count == 0) {
+diff -ru --exclude .svn octcdf/src/ov-ncdim.h octcdf-trunk/src/ov-ncdim.h
+--- octcdf/src/ov-ncdim.h	2010-03-26 10:34:55.000000000 -0600
++++ octcdf-trunk/src/ov-ncdim.h	2012-01-16 08:38:43.189283189 -0700
+@@ -33,7 +33,12 @@
+ 
+ class octave_ncdim:public octave_base_value {
+ public:
+-  octave_ncdim(void):octave_base_value(), ncd(NULL) { } 
++  octave_ncdim(void):octave_base_value(), ncd(NULL) {
++#   ifdef OV_NETCDF_VERBOSE
++    octave_stdout << "constructor NULL " << this << endl;
++#   endif
++    abort();
++  } 
+ 
+   octave_ncdim(const octave_ncdim& ncdim_val):octave_base_value(), ncd(ncdim_val.ncd) { 
+     ncd->count++;  
+@@ -65,8 +70,17 @@
+ 
+   ~octave_ncdim() { 
+ #   ifdef OV_NETCDF_VERBOSE
+-    octave_stdout << "destruct ncdim " << ncd << " count " << ncd->count << endl;
++    octave_stdout << "destruct ncdim " << ncd  << "-" << this << endl;
+ #   endif
++
++    if (!ncd) {
++      // nothing to do
++#     ifdef OV_NETCDF_VERBOSE
++      octave_stdout << "ncd already NULL " << ncd  << endl;
++#     endif
++      return;
++    }
++
+     ncd->count--;
+ 
+     if (ncd->count == 0) {
+diff -ru --exclude .svn octcdf/src/ov-ncfile.cc octcdf-trunk/src/ov-ncfile.cc
+--- octcdf/src/ov-ncfile.cc	2009-11-19 02:29:44.000000000 -0700
++++ octcdf-trunk/src/ov-ncfile.cc	2012-01-16 08:38:43.192283059 -0700
+@@ -378,8 +378,17 @@
+ octave_ncfile::~octave_ncfile(void)
+ {
+ # ifdef OV_NETCDF_VERBOSE
+-  octave_stdout << "destructor octave_ncfile " << nf  << " count " << nf->count << endl;
++  octave_stdout << "destructor octave_ncfile " << nf  << endl;
+ # endif
++
++  if (!nf) {
++    // nothing to do
++#   ifdef OV_NETCDF_VERBOSE
++    octave_stdout << "nf already NULL " << nf  << endl;
++#   endif
++    return;
++  }
++
+   nf->count--;
+ 
+   if (nf->count == 0)
+diff -ru --exclude .svn octcdf/src/ov-ncvar.cc octcdf-trunk/src/ov-ncvar.cc
+--- octcdf/src/ov-ncvar.cc	2009-11-19 02:29:44.000000000 -0700
++++ octcdf-trunk/src/ov-ncvar.cc	2012-01-16 08:38:43.173283884 -0700
+@@ -87,6 +87,15 @@
+ // destructor
+ 
+ octave_ncvar::~octave_ncvar() {
++
++    if (!ncv) {
++      // nothing to do
++#     ifdef OV_NETCDF_VERBOSE
++      octave_stdout << "ncv already NULL " << ncv  << endl;
++#     endif
++      return;
++    }
++
+     ncv->count--;
+ #   ifdef OV_NETCDF_VERBOSE
+     octave_stdout << "ncv count " << count << endl;
diff --git a/octave-octcdf.spec b/octave-octcdf.spec
index 453dca8..2e75e1b 100644
--- a/octave-octcdf.spec
+++ b/octave-octcdf.spec
@@ -2,12 +2,13 @@
 
 Name:           octave-%{octpkg}
 Version:        1.1.2
-Release:        4%{?dist}
+Release:        4.svn9526%{?dist}
 Summary:        A NetCDF interface for octave
 Group:          Applications/Engineering
 License:        GPLv2+
 URL:            http://octave.sourceforge.net/octcdf/
 Source0:        http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
+Patch0:         octave-%{octpkg}-svn9526.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  octave-devel  
@@ -24,6 +25,7 @@ A NetCDF interface for octave.
 
 %prep
 %setup -q -n %{octpkg}
+%patch0 -p1 -b .svn
 
 %build
 %octave_pkg_build
@@ -52,8 +54,9 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Mon Jan 16 2012 Orion Poplawski <orion at cora.nwra.com> 1.1.2-4
+* Mon Jan 16 2012 Orion Poplawski <orion at cora.nwra.com> 1.1.2-4.svn9526
 - Rebuild for octave 3.6.0
+- Update to latest svn to fix build issues
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

More information about the scm-commits mailing list