packages: netcdf/netcdf.spec, netcdf/netcdf-f90.patch (NEW), netcdf/netcdf-...

Sun Jun 26 09:42:30 CEST 2011

Author: qboosh                       Date: Sun Jun 26 07:42:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 4.1.3
- removed obsolete link patch
- added new patches: szip (library name fix), f90 (Fortran 90 compile fixes)
- build NetCDF 4 C++ interface
- tests need encoder-enabled szip library

---- Files affected:
packages/netcdf:
   netcdf.spec (1.36 -> 1.37) , netcdf-f90.patch (NONE -> 1.1)  (NEW), netcdf-szip.patch (NONE -> 1.1)  (NEW), netcdf-link.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/netcdf/netcdf.spec
diff -u packages/netcdf/netcdf.spec:1.36 packages/netcdf/netcdf.spec:1.37

--- packages/netcdf/netcdf.spec:1.36	Wed May  4 20:11:48 2011
+++ packages/netcdf/netcdf.spec	Sun Jun 26 09:42:25 2011
@@ -3,18 +3,20 @@
 # Conditional build:
 %bcond_without	f90	# don't build Fortran 90 interface (just builtin F77)
 %bcond_without	tests	# don't perform "make check"
+			# (note: tests need endoder-enabled szip)
 #
 Summary:	NetCDF: Network Common Data Form
 Summary(pl.UTF-8):	NetCDF: obsługa wspólnego sieciowego formatu danych
 Name:		netcdf
-Version:	4.1.2
+Version:	4.1.3
 Release:	1
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-%{version}.tar.gz
-# Source0-md5:	4a94ebe2d998d649159aa5665c83fb1a
+# Source0-md5:	46a40e1405df19d8cc6ddac16704b05f
 Patch0:		%{name}-info.patch
-Patch1:		%{name}-link.patch
+Patch1:		%{name}-szip.patch
+Patch2:		%{name}-f90.patch
 URL:		http://www.unidata.ucar.edu/packages/netcdf/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -27,6 +29,7 @@
 BuildRequires:	hdf5-devel >= 1.8.5
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:2.4
+BuildRequires:	szip-devel >= 2.1-2
 BuildRequires:	texinfo
 Requires:	hdf5 >= 1.8.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,6 +61,7 @@
 Requires:	%{name} = %{version}-%{release}
 Requires:	curl-devel
 Requires:	hdf5-devel >= 1.8.5
+Requires:	szip-devel
 
 %description devel
 Header files for netCDF - C interface.
@@ -164,6 +168,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cd udunits
@@ -180,16 +185,20 @@
 %{__automake}
 cd ..
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 CPPFLAGS="%{rpmcppflags} -DgFortran=1"
 %configure \
 	FCFLAGS="%{rpmcflags}" \
+	--enable-cxx-4 \
 	--enable-dap \
 	--enable-netcdf-4 \
 	--enable-shared
+# --enable-cdmremote doesn't build atm. (tested on 4.1.3)
+# --enable-hdf4 would cause dependency loop (hdf4 requires netcdf)
+# --with-libcf refers to symbols not included in its code (nctime.c) (tested on 4.1.3)
 
 %{__make}
 
@@ -269,20 +278,54 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnetcdf_c++.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnetcdf_c++.so.4
+%attr(755,root,root) %{_libdir}/libnetcdf_c++4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnetcdf_c++4.so.1
 
 %files c++-devel
 %defattr(644,root,root,755)
 %doc man4/netcdf-cxx.html
 %attr(755,root,root) %{_libdir}/libnetcdf_c++.so
+%attr(755,root,root) %{_libdir}/libnetcdf_c++4.so
 %{_libdir}/libnetcdf_c++.la
+%{_libdir}/libnetcdf_c++4.la
+# netcdf 3
 %{_includedir}/ncvalues.h
 %{_includedir}/netcdf.hh
 %{_includedir}/netcdfcpp.h
+# netcdf 4
+%{_includedir}/ncAtt.h
+%{_includedir}/ncByte.h
+%{_includedir}/ncChar.h
+%{_includedir}/ncCheck.h
+%{_includedir}/ncCompoundType.h
+%{_includedir}/ncDim.h
+%{_includedir}/ncDouble.h
+%{_includedir}/ncEnumType.h
+%{_includedir}/ncException.h
+%{_includedir}/ncFile.h
+%{_includedir}/ncFloat.h
+%{_includedir}/ncGroup.h
+%{_includedir}/ncGroupAtt.h
+%{_includedir}/ncInt.h
+%{_includedir}/ncInt64.h
+%{_includedir}/ncOpaqueType.h
+%{_includedir}/ncShort.h
+%{_includedir}/ncString.h
+%{_includedir}/ncType.h
+%{_includedir}/ncUbyte.h
+%{_includedir}/ncUint.h
+%{_includedir}/ncUint64.h
+%{_includedir}/ncUshort.h
+%{_includedir}/ncVar.h
+%{_includedir}/ncVarAtt.h
+%{_includedir}/ncVlenType.h
+%{_includedir}/netcdf
 %{_infodir}/netcdf-cxx.info*
 
 %files c++-static
 %defattr(644,root,root,755)
 %{_libdir}/libnetcdf_c++.a
+%{_libdir}/libnetcdf_c++4.a
 
 %files fortran
 %defattr(644,root,root,755)
@@ -314,6 +357,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2011/06/26 07:42:25  qboosh
+- updated to 4.1.3
+- removed obsolete link patch
+- added new patches: szip (library name fix), f90 (Fortran 90 compile fixes)
+- build NetCDF 4 C++ interface
+- tests need encoder-enabled szip library
+
 Revision 1.36  2011/05/04 18:11:48  qboosh
 - updated to 4.1.2 (note: new libnetcdf,libnetcdf_c++ sonames)
 - added link patch

================================================================
Index: packages/netcdf/netcdf-f90.patch
diff -u /dev/null packages/netcdf/netcdf-f90.patch:1.1
--- /dev/null	Sun Jun 26 09:42:30 2011
+++ packages/netcdf/netcdf-f90.patch	Sun Jun 26 09:42:25 2011
@@ -0,0 +1,39 @@
+--- netcdf-4.1.3/nf_test/f90tst_vars2.f90.orig	2011-06-10 15:35:01.000000000 +0200
++++ netcdf-4.1.3/nf_test/f90tst_vars2.f90	2011-06-25 09:04:21.118289857 +0200
+@@ -26,7 +26,6 @@
+   integer :: x_dimid, y_dimid
+   integer :: nvars, ngatts, ndims, unlimdimid, file_format
+   integer :: x, y
+-  integer, parameter :: CACHE_NELEMS = 10000, CACHE_SIZE = 1000000
+   integer, parameter :: DEFLATE_LEVEL = 4
+   integer (kind = 8), parameter :: TOE_SAN_VALUE = 2147483648_8
+   character (len = *), parameter :: VAR1_NAME = "Chon-Ji"
+@@ -74,8 +73,7 @@
+   call check(nf90_def_var(ncid, VAR2_NAME, NF90_INT, dimids, varid2, contiguous = .TRUE.))
+   call check(nf90_def_var(ncid, VAR3_NAME, NF90_INT64, varid3))
+   call check(nf90_def_var(ncid, VAR4_NAME, NF90_INT, x_dimid, varid4, contiguous = .TRUE.))
+-  call check(nf90_def_var(ncid, VAR5_NAME, NF90_INT, dimids, varid5, chunksizes = chunksizes, &
+-       option_mask = nf90_szip_ec_option_mask, bits_per_pixel = 16))
++  call check(nf90_def_var(ncid, VAR5_NAME, NF90_INT, dimids, varid5, chunksizes = chunksizes))
+ 
+   ! As a test, set and the check the chunk cache for one of these
+   ! variables. Really there is no need for this, since the 1 MB cache
+@@ -83,7 +82,7 @@
+   ! per-var chunk cache really helps performance.
+   call check(nf90_set_var_chunk_cache(ncid, varid1, CACHE_SIZE, &
+        CACHE_NELEMS, CACHE_PREEMPTION))
+-  call check(nf90_inquire_variable(ncid, varid1_in, cache_size = cache_size_in, &
++  call check(nf90_inquire_variable(ncid, varid1, cache_size = cache_size_in, &
+        cache_nelems = cache_nelems_in, cache_preemption = cache_preemption_in))
+   if (cache_size_in .ne. CACHE_SIZE .or. cache_nelems_in .ne. &
+        CACHE_NELEMS .or. cache_preemption_in .ne. CACHE_PREEMPTION) stop 1
+--- netcdf-4.1.3/f90/netcdf_visibility.f90.orig	2011-06-10 15:35:03.000000000 +0200
++++ netcdf-4.1.3/f90/netcdf_visibility.f90	2011-06-25 15:30:24.575732121 +0200
+@@ -20,6 +20,6 @@
+   public :: nf90_put_att, nf90_get_att
+   
+   ! Variable routines
+-  public :: nf90_def_var, nf90_inq_varid, nf90_rename_var, nf90_inquire_variable 
++  public :: nf90_def_var, nf90_inq_varid, nf90_set_var_chunk_cache, nf90_rename_var, nf90_inquire_variable 
+   ! overloaded functions
+   public :: nf90_put_var, nf90_get_var

================================================================
Index: packages/netcdf/netcdf-szip.patch
diff -u /dev/null packages/netcdf/netcdf-szip.patch:1.1
--- /dev/null	Sun Jun 26 09:42:31 2011
+++ packages/netcdf/netcdf-szip.patch	Sun Jun 26 09:42:25 2011
@@ -0,0 +1,11 @@
+--- netcdf-4.1.3/configure.ac.orig	2011-06-17 22:49:33.000000000 +0200
++++ netcdf-4.1.3/configure.ac	2011-06-23 08:42:55.195794154 +0200
+@@ -836,7 +836,7 @@
+    # The user may have built HDF5 with the SZLIB library.
+    if test "x$ac_cv_func_H5Z_SZIP" = xyes; then
+       AC_DEFINE([USE_SZIP], [1], [if true, compile in szip compression in netCDF-4 variables])
+-      AC_SEARCH_LIBS([SZ_Compress], [szip], [], 
++      AC_SEARCH_LIBS([SZ_Compress], [sz szip], [], 
+       [AC_MSG_ERROR([Can't find or link to the szlib library. Use --disable-netcdf-4, or see config.log for errors.])])
+    fi
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netcdf/netcdf.spec?r1=1.36&r2=1.37&f=u

