rpms/netcdf/devel netcdf-3.6.2-gcc43.patch, NONE, 1.1 netcdf.spec, 1.23, 1.24 netcdf_gcc-3.3_needs_string-h.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/netcdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12739

Modified Files:
	netcdf.spec 
Added Files:
	netcdf-3.6.2-gcc43.patch 
Removed Files:
	netcdf_gcc-3.3_needs_string-h.patch 
Log Message:
* Wed Apr  2 2008 Orion Poplawski <orion at cora.nwra.com> - 3.6.2-7
- Change patch to include <cstring>


netcdf-3.6.2-gcc43.patch:

--- NEW FILE netcdf-3.6.2-gcc43.patch ---
--- netcdf-3.6.2/cxx/ncvalues.cpp.gcc43	2006-12-29 09:38:56.000000000 -0700
+++ netcdf-3.6.2/cxx/ncvalues.cpp	2008-04-02 13:45:39.000000000 -0600
@@ -9,7 +9,7 @@
 
 #include <config.h>
 #include <iostream>
-#include <string>
+#include <cstring>
 
 #include "ncvalues.h"
 
--- netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp.gcc43	2007-01-19 05:52:13.000000000 -0700
+++ netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp	2008-04-02 13:46:08.000000000 -0600
@@ -18,6 +18,7 @@
 
 #include <iostream>
 #include <netcdfcpp.h>
+#include <cstring>
 
 using namespace std;
 


Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- netcdf.spec	21 Feb 2008 03:00:59 -0000	1.23
+++ netcdf.spec	2 Apr 2008 19:50:36 -0000	1.24
@@ -1,13 +1,13 @@
 Name:           netcdf
 Version:        3.6.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
 Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.2.tar.bz2
-Patch0:         netcdf_gcc-3.3_needs_string-h.patch
+Patch0:         netcdf-3.6.2-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, gawk
@@ -63,7 +63,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .gcc43
 
 %build
 export FC="gfortran"
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Wed Apr  2 2008 Orion Poplawski <orion at cora.nwra.com> - 3.6.2-7
+- Change patch to include <cstring>
+
 * Wed Feb 20 2008 Ed Hill <ed at eh3.com> - 3.6.2-6
 - add patch that (hopefully?) allows the GCC 4.3 build to proceed
 


--- netcdf_gcc-3.3_needs_string-h.patch DELETED ---