Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2012-04-12 09:42:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf (Old) and /work/SRC/openSUSE:Factory/.netcdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netcdf", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2012-03-22 12:36:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf.new/netcdf.changes 2012-04-12 09:42:48.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 9 22:20:02 UTC 2012 - [email protected] + +- Updated to 4.2 + * Fortran and C++ APIs are now in separate packages +- Removed netcdf-dependencies.patch + +------------------------------------------------------------------- +Thu Apr 5 00:05:54 UTC 2012 - [email protected] + +- Do not require valgrind on arches where it is not available + (e.g. sparc) + +------------------------------------------------------------------- Old: ---- netcdf-4.1.3.tar.bz2 netcdf-dependencies.patch New: ---- netcdf-4.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.AmxXew/_old 2012-04-12 09:42:50.000000000 +0200 +++ /var/tmp/diff_new_pack.AmxXew/_new 2012-04-12 09:42:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package netcdf # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,32 +16,34 @@ # -%define ncdf_so_major 4 +%define ncdf_so_major 7 Name: netcdf Summary: Libraries for the Unidata network Common Data Form -Version: 4.1.3 -Release: 0 -Group: System/Libraries License: SUSE-NetCDF -URL: http://www.unidata.ucar.edu/software/netcdf/ +Group: System/Libraries +Version: 4.2 +Release: 0 +Url: http://www.unidata.ucar.edu/software/netcdf/ Source: %{name}-%{version}.tar.bz2 Source1: nc-config.1.gz Patch0: %{name}-correct_casting.patch -Patch1: %{name}-dependencies.patch -Patch2: %{name}-codecleanup.patch -Patch3: %{name}-no_date_time.patch +Patch1: %{name}-codecleanup.patch +Patch2: %{name}-no_date_time.patch #Strip FFLAGS from nc-config #Use pkgconfig in nc-config to avoid multi-lib issues -Patch4: netcdf-pkgconfig.patch +Patch3: netcdf-pkgconfig.patch #Strip FFLAGS from nc-config -Patch6: netcdf-fflags.patch +Patch4: netcdf-fflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gawk gcc-c++ gcc-fortran -BuildRequires: pkg-config zlib-devel +BuildRequires: gawk +BuildRequires: gcc-c++ +BuildRequires: gcc-fortran BuildRequires: hdf5-devel >= 1.8.4 BuildRequires: libcurl-devel -%ifnarch s390 s390x +BuildRequires: pkg-config +BuildRequires: zlib-devel +%ifarch %ix86 x86_64 ppc ppc64 s390x armv7l BuildRequires: valgrind %endif PreReq: %install_info_prereq @@ -81,9 +83,9 @@ %package devel Summary: Development files for netcdf Group: Development/Libraries/C and C++ -Requires: libnetcdf%{ncdf_so_major} = %{version} -Requires: libcurl-devel Requires: hdf5-devel +Requires: libcurl-devel +Requires: libnetcdf%{ncdf_so_major} = %{version} Requires: pkgconfig %description devel @@ -118,11 +120,10 @@ %prep %setup -q %patch0 -p1 -b .correct_casting -%patch1 -p1 -b .dependencies -%patch2 -p1 -b .codecleanup -%patch3 -p1 -b .no_date_time -%patch4 -p1 -b .pkgconfig -%patch6 -p1 -b .fflags +%patch1 -p1 -b .codecleanup +%patch2 -p1 -b .no_date_time +%patch3 -p1 -b .pkgconfig +%patch4 -p1 -b .fflags %build export CC=gcc CXX=g++ FC=gfortran \ @@ -136,6 +137,7 @@ --enable-extra-example-tests \ --disable-dap-remote-tests \ --with-pic \ + --disable-doxygen \ --enable-static # %%ifnarch s390 s390x # --enable-valgrind-tests \ @@ -196,16 +198,13 @@ %files -n libnetcdf%{ncdf_so_major} %defattr(-,root,root,-) %{_libdir}/libnetcdf.so.* -%{_libdir}/libnetcdf_c++.so.* -%{_libdir}/libnetcdff.so.* %files doc %defattr(-,root,root,-) %{_mandir}/man1/* -%{_infodir}/* %files devel-static %defattr(-,root,root,-) -%{_libdir}/*.a +%{_libdir}/libnetcdf.a %changelog ++++++ netcdf-4.1.3.tar.bz2 -> netcdf-4.2.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/netcdf/netcdf-4.1.3.tar.bz2 /work/SRC/openSUSE:Factory/.netcdf.new/netcdf-4.2.tar.bz2 differ: char 11, line 1 ++++++ netcdf-codecleanup.patch ++++++ --- /var/tmp/diff_new_pack.AmxXew/_old 2012-04-12 09:42:50.000000000 +0200 +++ /var/tmp/diff_new_pack.AmxXew/_new 2012-04-12 09:42:50.000000000 +0200 @@ -1,18 +1,5 @@ -diff -Naur netcdf-4.1.2.orig/ncdump/vardata.c netcdf-4.1.2/ncdump/vardata.c ---- netcdf-4.1.2.orig/ncdump/vardata.c 2011-04-29 11:28:25.844837891 -0400 -+++ netcdf-4.1.2/ncdump/vardata.c 2011-04-29 11:59:04.541851017 -0400 -@@ -673,7 +673,7 @@ - * exceed the capacity of some platforms), we break each row - * into smaller chunks, if necessary. - */ -- size_t corsav; -+ size_t corsav = 0; - int left = (int)ncols; - boolean lastrow; - -diff -Naur netcdf-4.1.2.orig/ncgen3/load.c netcdf-4.1.2/ncgen3/load.c ---- netcdf-4.1.2.orig/ncgen3/load.c 2011-04-29 11:28:25.797838480 -0400 -+++ netcdf-4.1.2/ncgen3/load.c 2011-04-29 12:00:18.406927576 -0400 +--- netcdf-4.2.orig/ncgen3/load.c 2012-03-20 21:30:49.000000000 -0400 ++++ netcdf-4.2/ncgen3/load.c 2012-04-09 17:29:58.561798439 -0400 @@ -13,6 +13,10 @@ #include "ncgen.h" #include "genlib.h" ++++++ netcdf-correct_casting.patch ++++++ --- /var/tmp/diff_new_pack.AmxXew/_old 2012-04-12 09:42:50.000000000 +0200 +++ /var/tmp/diff_new_pack.AmxXew/_new 2012-04-12 09:42:50.000000000 +0200 @@ -1,11 +1,11 @@ ---- netcdf-4.1.2.orig/libsrc/posixio.c 2011-04-29 11:28:29.581791173 -0400 -+++ netcdf-4.1.2/libsrc/posixio.c 2011-04-29 11:48:57.164444279 -0400 -@@ -617,7 +617,7 @@ +--- netcdf-4.2.orig/libsrc/posixio.c 2012-03-20 21:30:52.000000000 -0400 ++++ netcdf-4.2/libsrc/posixio.c 2012-04-09 17:42:39.802281622 -0400 +@@ -633,7 +633,7 @@ pxp->bf_rflags |= rflags; pxp->bf_refcount++; - *vpp = (char *)pxp->bf_base + diff; -+ *vpp = (void *)((char *)pxp->bf_base + diff); ++ *vpp = (void *)((char *)pxp->bf_base + diff); return ENOERR; } ++++++ netcdf-no_date_time.patch ++++++ --- /var/tmp/diff_new_pack.AmxXew/_old 2012-04-12 09:42:50.000000000 +0200 +++ /var/tmp/diff_new_pack.AmxXew/_new 2012-04-12 09:42:50.000000000 +0200 @@ -1,11 +1,11 @@ ---- netcdf-4.1.2.orig/libdispatch/error.c 2011-04-29 11:28:29.637790474 -0400 -+++ netcdf-4.1.2/libdispatch/error.c 2011-04-29 12:17:07.637310459 -0400 -@@ -9,7 +9,7 @@ +--- netcdf-4.2.orig/libdispatch/derror.c 2012-03-20 21:30:48.000000000 -0400 ++++ netcdf-4.2/libdispatch/derror.c 2012-04-09 17:03:31.728636583 -0400 +@@ -10,7 +10,7 @@ #include "ncdispatch.h" /* Tell the user the version of netCDF. */ -static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $"; +static const char nc_libvers[] = PACKAGE_VERSION " $"; - const char * - nc_inq_libvers(void) + /** \defgroup lib_version Library Version + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
