rpms/netcdf/devel netcdf-4.0.0-beta2-gcc4.3-cstring.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 netcdf.spec, 1.25, 1.26 sources, 1.6, 1.7
Ed Hill (edhill)
fedora-extras-commits at redhat.com
Thu May 8 04:56:27 UTC 2008
Author: edhill
Update of /cvs/pkgs/rpms/netcdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15489
Modified Files:
.cvsignore netcdf.spec sources
Added Files:
netcdf-4.0.0-beta2-gcc4.3-cstring.patch
Log Message:
netcdf: try out upstream 4.0.0-beta2
netcdf-4.0.0-beta2-gcc4.3-cstring.patch:
--- NEW FILE netcdf-4.0.0-beta2-gcc4.3-cstring.patch ---
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 <iostream>
+#include <cstring>
#include <netcdfcpp.h>
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 <iostream>
+#include <cstring>
#include <netcdfcpp4.h>
using namespace std;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 18 Mar 2007 19:20:16 -0000 1.6
+++ .cvsignore 8 May 2008 04:55:48 -0000 1.7
@@ -1 +1 @@
-netcdf-3.6.2.tar.bz2
+netcdf-4.0-beta2.tar.gz
Index: netcdf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- netcdf.spec 2 Apr 2008 20:02:07 -0000 1.25
+++ netcdf.spec 8 May 2008 04:55:48 -0000 1.26
@@ -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 @@
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 @@
%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 @@
%clean
rm -rf ${RPM_BUILD_ROOT}
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+/sbin/install-info %{_infodir}/netcdf.info.gz \
+ %{_infodir}/dir 2>/dev/null || :
+
+%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 @@
%{_bindir}/*
%{_libdir}/*.so.*
%{_mandir}/man1/*
+%{_infodir}/*
%files devel
%defattr(-,root,root,-)
+%{_includedir}/netcdf
%{_includedir}/netcdf-3
%{_libdir}/*.so
%{_mandir}/man3/*
@@ -122,6 +138,9 @@
%changelog
+* Wed May 7 2008 Ed Hill <ed at eh3.com> - 4.0.0-0.1.beta2
+- try out upstream 4.0.0-beta2
+
* Wed Apr 2 2008 Orion Poplawski <orion at cora.nwra.com> - 3.6.2-7
- Change patch to include <cstring>
- Remove %%{?_smp_mflags} - not parallel build safe (fortran modules)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/netcdf/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 18 Mar 2007 19:20:16 -0000 1.6
+++ sources 8 May 2008 04:55:48 -0000 1.7
@@ -1 +1 @@
-1eca0ea1e81e14ebc5bb93e5dd25c364 netcdf-3.6.2.tar.bz2
+9c655603351bbe6cd6039808acca39b7 netcdf-4.0-beta2.tar.gz
More information about the fedora-extras-commits
mailing list