From 02aa12d1a1de4c34588c97a738de33d9b5c94a88 Mon Sep 17 00:00:00 2001 From: Ed Hill Date: May 08 2008 04:55:48 +0000 Subject: netcdf: try out upstream 4.0.0-beta2 --- diff --git a/.cvsignore b/.cvsignore index e49105d..e28ea0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -netcdf-3.6.2.tar.bz2 +netcdf-4.0-beta2.tar.gz diff --git a/netcdf-4.0.0-beta2-gcc4.3-cstring.patch b/netcdf-4.0.0-beta2-gcc4.3-cstring.patch new file mode 100644 index 0000000..e890982 --- /dev/null +++ b/netcdf-4.0.0-beta2-gcc4.3-cstring.patch @@ -0,0 +1,22 @@ +diff -urN netcdf-4.0-beta2-ORIG/examples/CXX/sfc_pres_temp_rd.cpp netcdf-4.0-beta2/examples/CXX/sfc_pres_temp_rd.cpp +--- netcdf-4.0-beta2-ORIG/examples/CXX/sfc_pres_temp_rd.cpp 2007-01-19 07:52:13.000000000 -0500 ++++ netcdf-4.0-beta2/examples/CXX/sfc_pres_temp_rd.cpp 2008-05-08 00:29:54.000000000 -0400 +@@ -17,6 +17,7 @@ + */ + + #include ++#include + #include + + using namespace std; +diff -urN netcdf-4.0-beta2-ORIG/examples/CXX4/sfc_pres_temp_rd.cpp netcdf-4.0-beta2/examples/CXX4/sfc_pres_temp_rd.cpp +--- netcdf-4.0-beta2-ORIG/examples/CXX4/sfc_pres_temp_rd.cpp 2007-07-29 20:18:22.000000000 -0400 ++++ netcdf-4.0-beta2/examples/CXX4/sfc_pres_temp_rd.cpp 2008-05-08 00:30:54.000000000 -0400 +@@ -17,6 +17,7 @@ + */ + + #include ++#include + #include + + using namespace std; diff --git a/netcdf.spec b/netcdf.spec index 943b393..a09d73c 100644 --- a/netcdf.spec +++ b/netcdf.spec @@ -1,37 +1,38 @@ Name: netcdf -Version: 3.6.2 -Release: 7%{?dist} -Summary: Libraries for the Unidata network Common Data Form (NetCDF v3) +Version: 4.0.0 +Release: 0.1.beta2%{?dist} +Summary: Libraries for the Unidata network Common Data Form 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-3.6.2-gcc43.patch +Source0: ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.0-beta2.tar.gz +Patch0: netcdf-4.0.0-beta2-gcc4.3-cstring.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran, gawk -# BuildRequires: compat-gcc-34-g77 +BuildRequires: hdf5-devel %package devel -Summary: Development files for netcdf-3 +Summary: Development files for netcdf Group: Development/Libraries Requires: %{name} = %{version}-%{release} %package static -Summary: Static libs for netcdf-3 +Summary: Static libs for netcdf Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description -NetCDF-3 (network Common Data Form ver3) is an interface for -array-oriented data access and a freely-distributed collection of -software libraries for C, Fortran, C++, and perl that provides an -implementation of the interface. The NetCDF library also defines a -machine-independent format for representing scientific data. Together, -the interface, library, and format support the creation, access, and -sharing of scientific data. The NetCDF software was developed at the -Unidata Program Center in Boulder, Colorado. + +NetCDF (network Common Data Form) is an interface for array-oriented +data access and a freely-distributed collection of software libraries +for C, Fortran, C++, and perl that provides an implementation of the +interface. The NetCDF library also defines a machine-independent +format for representing scientific data. Together, the interface, +library, and format support the creation, access, and sharing of +scientific data. The NetCDF software was developed at the Unidata +Program Center in Boulder, Colorado. NetCDF data is: @@ -55,15 +56,15 @@ NetCDF data is: access the same NetCDF file. %description devel -This package contains the netCDF-3 header files, shared devel libs, and +This package contains the netCDF header files, shared devel libs, and man pages. %description static -This package contains the netCDF-3 static libs. +This package contains the netCDF static libs. %prep -%setup -q -%patch0 -p1 -b .gcc43 +%setup -q -n netcdf-4.0-beta2 +%patch0 -p1 %build export FC="gfortran" @@ -77,10 +78,15 @@ make %install %makeinstall -mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 +mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/netcdf /bin/mv ${RPM_BUILD_ROOT}%{_includedir}/*.* \ - ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 + ${RPM_BUILD_ROOT}%{_includedir}/netcdf /bin/rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la +/bin/rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir + +# for backwards compatibility with previous Fedora versions +( cd ${RPM_BUILD_ROOT}%{_includedir} ; ln -s ../netcdf netcdf-3 ) + # # Does the /usr/include/netcdf-3/netcdf.mod file really belong in # /usr/include/netcdf-3/ or should it go in /usr/lib/netcdf-3 ??? @@ -99,9 +105,17 @@ make check %clean rm -rf ${RPM_BUILD_ROOT} -%post -p /sbin/ldconfig +%post +/sbin/ldconfig +/sbin/install-info %{_infodir}/netcdf.info.gz \ + %{_infodir}/dir 2>/dev/null || : -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/netcdf.info.gz \ + %{_infodir}/dir 2>/dev/null || : +fi %files %defattr(-,root,root,-) @@ -109,9 +123,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_bindir}/* %{_libdir}/*.so.* %{_mandir}/man1/* +%{_infodir}/* %files devel %defattr(-,root,root,-) +%{_includedir}/netcdf %{_includedir}/netcdf-3 %{_libdir}/*.so %{_mandir}/man3/* @@ -122,6 +138,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed May 7 2008 Ed Hill - 4.0.0-0.1.beta2 +- try out upstream 4.0.0-beta2 + * Wed Apr 2 2008 Orion Poplawski - 3.6.2-7 - Change patch to include - Remove %%{?_smp_mflags} - not parallel build safe (fortran modules) diff --git a/sources b/sources index 8ae8d16..d85a907 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1eca0ea1e81e14ebc5bb93e5dd25c364 netcdf-3.6.2.tar.bz2 +9c655603351bbe6cd6039808acca39b7 netcdf-4.0-beta2.tar.gz