From 72fa52a8eea8da2f71fbbf65bbdc76e8d8f88f41 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Apr 02 2008 19:50:36 +0000
Subject: - Change patch to include <cstring>


---

diff --git a/netcdf-3.6.2-gcc43.patch b/netcdf-3.6.2-gcc43.patch
new file mode 100644
index 0000000..bdd8f5d
--- /dev/null
+++ b/netcdf-3.6.2-gcc43.patch
@@ -0,0 +1,21 @@
+--- 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;
+ 
diff --git a/netcdf.spec b/netcdf.spec
index 1ca79ba..2c54005 100644
--- a/netcdf.spec
+++ b/netcdf.spec
@@ -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 @@ This package contains the netCDF-3 static libs.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .gcc43
 
 %build
 export FC="gfortran"
@@ -122,6 +122,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Apr  2 2008 Orion Poplawski <orion@cora.nwra.com> - 3.6.2-7
+- Change patch to include <cstring>
+
 * Wed Feb 20 2008 Ed Hill <ed@eh3.com> - 3.6.2-6
 - add patch that (hopefully?) allows the GCC 4.3 build to proceed
 
diff --git a/netcdf_gcc-3.3_needs_string-h.patch b/netcdf_gcc-3.3_needs_string-h.patch
deleted file mode 100644
index a873d01..0000000
--- a/netcdf_gcc-3.3_needs_string-h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN netcdf-3.6.2/cxx/ncvalues.cpp netcdf-3.6.2-NEW/cxx/ncvalues.cpp
---- netcdf-3.6.2/cxx/ncvalues.cpp	2006-12-29 11:38:56.000000000 -0500
-+++ netcdf-3.6.2-NEW/cxx/ncvalues.cpp	2008-02-20 21:28:28.000000000 -0500
-@@ -10,6 +10,7 @@
- #include <config.h>
- #include <iostream>
- #include <string>
-+#include <string.h>
- 
- #include "ncvalues.h"
- 
-diff -urN netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp netcdf-3.6.2-NEW/examples/CXX/sfc_pres_temp_rd.cpp
---- netcdf-3.6.2/examples/CXX/sfc_pres_temp_rd.cpp	2007-01-19 07:52:13.000000000 -0500
-+++ netcdf-3.6.2-NEW/examples/CXX/sfc_pres_temp_rd.cpp	2008-02-20 21:48:24.000000000 -0500
-@@ -18,6 +18,7 @@
- 
- #include <iostream>
- #include <netcdfcpp.h>
-+#include <string.h>
- 
- using namespace std;
-