rpms/libnc-dap/devel libnc-dap-3.7.0-gcc43.patch, NONE, 1.1 libnc-dap.spec, 1.22, 1.23

[Patrice Dumas]

Author: pertusus

Update of /cvs/extras/rpms/libnc-dap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13422

Modified Files:
	libnc-dap.spec 
Added Files:
	libnc-dap-3.7.0-gcc43.patch 
Log Message:
* Thu Sep  4 2008 Patrice Dumas <pertusus at free.fr> 3.7.0-11
- gcc 4.3 patch for missing include files


libnc-dap-3.7.0-gcc43.patch:

--- NEW FILE libnc-dap-3.7.0-gcc43.patch ---
diff -up libnc-dap-3.7.0/ClientParams.cc.gcc43 libnc-dap-3.7.0/ClientParams.cc
--- libnc-dap-3.7.0/ClientParams.cc.gcc43	2006-11-06 23:06:22.000000000 +0100
+++ libnc-dap-3.7.0/ClientParams.cc	2008-05-23 16:07:58.000000000 +0200
@@ -25,6 +25,7 @@
 
 #include "ClientParams.h"
 
+#include <cstdlib>
 #include <sstream>
 
 // #define DODS_DEBUG 1
diff -up libnc-dap-3.7.0/Dattr.cc.gcc43 libnc-dap-3.7.0/Dattr.cc
--- libnc-dap-3.7.0/Dattr.cc.gcc43	2006-11-22 01:14:38.000000000 +0100
+++ libnc-dap-3.7.0/Dattr.cc	2008-05-23 16:10:03.000000000 +0200
@@ -36,6 +36,8 @@
 
 #include "config_nc.h"
 
+#include <cstring>
+
 static char rcsid[] not_used ={"$Id: Dattr.cc 15125 2006-11-21 23:12:00Z jimg $"};
 
 #include "Dnetcdf.h"
diff -up libnc-dap-3.7.0/Ddim.cc.gcc43 libnc-dap-3.7.0/Ddim.cc
--- libnc-dap-3.7.0/Ddim.cc.gcc43	2006-11-06 23:06:22.000000000 +0100
+++ libnc-dap-3.7.0/Ddim.cc	2008-05-23 16:09:40.000000000 +0200
@@ -37,6 +37,8 @@
 
 #include "config_nc.h"
 
+#include <cstring>
+
 static char rcsid[] not_used ={"$Id: Ddim.cc 11906 2005-08-08 19:51:43Z root $"};
 
 #include "Dnetcdf.h"
diff -up libnc-dap-3.7.0/Dncx.cc.gcc43 libnc-dap-3.7.0/Dncx.cc
--- libnc-dap-3.7.0/Dncx.cc.gcc43	2006-11-06 23:06:22.000000000 +0100
+++ libnc-dap-3.7.0/Dncx.cc	2008-05-23 16:07:58.000000000 +0200
@@ -32,7 +32,7 @@
 // $Id: Dncx.cc 11906 2005-08-08 19:51:43Z root $ 
 
 #include "Dncx.h"
-#include <string.h>
+#include <cstring>
 #include <limits.h>
 /* alias poorly named limits.h macros */
 #define  SHORT_MAX  SHRT_MAX
diff -up libnc-dap-3.7.0/Dvar.cc.gcc43 libnc-dap-3.7.0/Dvar.cc
--- libnc-dap-3.7.0/Dvar.cc.gcc43	2006-11-06 23:06:22.000000000 +0100
+++ libnc-dap-3.7.0/Dvar.cc	2008-05-23 16:10:29.000000000 +0200
@@ -36,6 +36,8 @@
 
 #include "config_nc.h"
 
+#include <cstring>
+
 static char rcsid[] not_used ={"$Id: Dvar.cc 11906 2005-08-08 19:51:43Z root $"};
 
 #include "Dnetcdf.h"
diff -up libnc-dap-3.7.0/NCArray.cc.gcc43 libnc-dap-3.7.0/NCArray.cc
--- libnc-dap-3.7.0/NCArray.cc.gcc43	2006-04-19 20:06:01.000000000 +0200
+++ libnc-dap-3.7.0/NCArray.cc	2008-05-23 16:07:58.000000000 +0200
@@ -41,11 +41,7 @@
 static char rcsid[] not_used =
     { "$Id: NCArray.cc 13725 2006-04-19 18:06:01Z jimg $" };
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
+#include <cstring>
 #include <iostream>
 #include <sstream>
 #include <algorithm>
diff -up libnc-dap-3.7.0/nc_util.cc.gcc43 libnc-dap-3.7.0/nc_util.cc
--- libnc-dap-3.7.0/nc_util.cc.gcc43	2006-11-22 23:08:33.000000000 +0100
+++ libnc-dap-3.7.0/nc_util.cc	2008-05-23 16:07:58.000000000 +0200
@@ -37,6 +37,7 @@
 static char rcsid[] not_used =
     { "$Id: nc_util.cc 15135 2006-11-22 21:05:57Z jimg $" };
 
+#include <cstring>
 #include <sstream>
 
 // #define DODS_DEBUG


Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libnc-dap.spec	19 Feb 2008 18:21:08 -0000	1.22
+++ libnc-dap.spec	4 Sep 2008 15:50:06 -0000	1.23
@@ -1,7 +1,7 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
 Version: 3.7.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 Group: Development/Libraries
 # ncdump, netcdf headers, lnetcdf are coverd by a BSD/MIT-like license
@@ -10,6 +10,7 @@
 URL: http://www.opendap.org/
 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
 Patch0: libnc-dap-3.7.0-nolibdir.patch
+Patch1: libnc-dap-3.7.0-gcc43.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libdap-devel >= 3.7.3 gcc-gfortran
@@ -39,6 +40,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nolibdir
+%patch1 -p1 -b .gcc43
 rm -rf netcdf/.svn
 
 %build
@@ -74,6 +76,9 @@
 
 
 %changelog
+* Thu Sep  4 2008 Patrice Dumas <pertusus at free.fr> 3.7.0-11
+- gcc 4.3 patch for missing include files
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.7.0-10
 - Autorebuild for GCC 4.3