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

Ed Hill (edhill) fedora-extras-commits at redhat.com
Thu Feb 21 03:01:37 UTC 2008


Author: edhill

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

Modified Files:
	netcdf.spec 
Added Files:
	netcdf_gcc-3.3_needs_string-h.patch 
Log Message:
try to fix GCC 4.3 build


netcdf_gcc-3.3_needs_string-h.patch:

--- NEW FILE netcdf_gcc-3.3_needs_string-h.patch ---
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;
 


Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- netcdf.spec	19 Feb 2008 02:23:35 -0000	1.22
+++ netcdf.spec	21 Feb 2008 03:00:59 -0000	1.23
@@ -1,12 +1,13 @@
 Name:           netcdf
 Version:        3.6.2
-Release:        5%{?dist}
+Release:        6%{?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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran, gawk
@@ -62,6 +63,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export FC="gfortran"
@@ -120,6 +122,9 @@
 
 
 %changelog
+* 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
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.6.2-5
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list