Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at Fri Apr 15 20:17:18 CEST 2011.
-------- --- netcdf/netcdf.changes 2009-07-13 16:11:27.000000000 +0200 +++ netcdf/netcdf.changes 2010-11-30 20:02:44.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 30 19:59:19 CET 2010 - p...@suse.de + +- Just fix the casting in px_get to avoid the type-punning warning. +- Add a man page for nc-config. +- Move nc-config and its man page to the devel package. +- Remove the dependency on netcdf from libnetcdf. +- BuildRequire pkgconfig for libnetcdf-devel. +- Declare strlcat if needed. +- Don't use __DATE__ and __TIME__ to reduce the need for recompiling. + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- netcdf-4.0.1-strict-aliasing.patch New: ---- nc-config.1.gz netcdf-codecleanup.patch netcdf-correct_casting.patch netcdf-no_date_time.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.p06OPq/_old 2011-04-15 20:16:34.000000000 +0200 +++ /var/tmp/diff_new_pack.p06OPq/_new 2011-04-15 20:16:34.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package netcdf (Version 4.0.1) +# spec file for package netcdf # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -17,18 +17,22 @@ # norootforbuild +%define ncdf_so_major 4 Name: netcdf Summary: Library for Array Oriented Data Access Version: 4.0.1 -Release: 2 +Release: 12 Group: System/Libraries License: MIT License (or similar) Url: http://www.unidata.ucar.edu/software/netcdf/ Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-strict-aliasing.patch +Source1: nc-config.1.gz +Patch0: netcdf-correct_casting.patch Patch1: %{name}-%{version}-dependencies.patch Patch2: %{name}-%{version}-delete.patch +Patch3: netcdf-codecleanup.patch +Patch4: netcdf-no_date_time.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ gcc-fortran PreReq: %install_info_prereq @@ -46,15 +50,16 @@ Steve Emmerson Harvey Davies <supp...@unidata.ucar.edu> -%package -n libnetcdf4 +%package -n libnetcdf%{ncdf_so_major} + + License: MIT License (or similar) Summary: Library for Array Oriented Data Access Group: Development/Libraries/C and C++ -Requires: netcdf = %{version} Provides: libnetcdf-4 = %{version} Obsoletes: libnetcdf-4 < %{version} -%description -n libnetcdf4 +%description -n libnetcdf%{ncdf_so_major} This library provides array-oriented data access for the languages C and C++. @@ -71,8 +76,9 @@ License: MIT License (or similar) Summary: Library for Array Oriented Data Access Group: Development/Libraries/C and C++ -Requires: libnetcdf4 = %{version} +Requires: libnetcdf%{ncdf_so_major} = %{version} Requires: pkgconfig +BuildRequires: pkgconfig %description -n libnetcdf-devel This library provides array-oriented data access for the languages C @@ -92,23 +98,28 @@ %patch0 %patch1 %patch2 +%patch3 +%patch4 %build +export CC=gcc CXX=g++ FC=gfortran \ + CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" FCFLAGS="%{optflags}" + %configure \ --enable-shared \ --disable-static \ - --with-pic \ - CC=gcc CXX=g++ FC=gfortran \ - CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" FCFLAGS="$RPM_OPT_FLAGS" + --with-pic make %{?jobs:-j %jobs} %install %makeinstall -rm -f $RPM_BUILD_ROOT%{_infodir}/dir -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +mkdir -p %{buildroot}%{_mandir}/man1 +install -m644 %{S:1} %{buildroot}%{_mandir}/man1 +rm -f %{buildroot}%{_infodir}/dir +rm -f %{buildroot}%{_libdir}/*.la %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -n libnetcdf-devel for i in netcdf-c netcdf-tutorial netcdf-f90 netcdf-f77 netcdf-install netcdf netcdf-cxx; do @@ -120,25 +131,29 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/$i.info.gz done -%post -n libnetcdf4 -p /sbin/ldconfig +%post -n libnetcdf%{ncdf_so_major} -p /sbin/ldconfig -%postun -n libnetcdf4 -p /sbin/ldconfig +%postun -n libnetcdf%{ncdf_so_major} -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYRIGHT README RELEASE_NOTES %{_bindir}/* +%exclude %{_bindir}/nc-config %{_mandir}/man1/* +%exclude %{_mandir}/man1/nc-config.1.gz %files -n libnetcdf-devel %defattr(-,root,root) +%{_bindir}/nc-config %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/netcdf.pc +%{_mandir}/man1/nc-config.1.gz %{_mandir}/man3/* %{_infodir}/* -%files -n libnetcdf4 +%files -n libnetcdf%{ncdf_so_major} %defattr(-,root,root) %{_libdir}/libnetcdf.so.* %{_libdir}/libnetcdf_c++.so.* ++++++ netcdf-codecleanup.patch ++++++ Index: ncdump/vardata.c =================================================================== --- ncdump/vardata.c.orig 2009-02-14 21:44:16.000000000 +0100 +++ ncdump/vardata.c 2010-11-30 12:05:12.576895864 +0100 @@ -73,7 +73,7 @@ print_any_att_val ( const void *valp /* pointer to the value */ ) { nctype_t *typ = attp->tinfo; - (void *) (*typ->typ_tostring)(typ, sb, valp); + (*typ->typ_tostring)(typ, sb, valp); } @@ -95,7 +95,7 @@ print_any_val( (const void*)varp->fillvalp, valp) ) { sbuf_cpy(sb, FILL_STRING); } else { - (void *) (*varp->val_tostring)(varp, sb, valp); + (*varp->val_tostring)(varp, sb, valp); } } @@ -660,7 +660,7 @@ vardatax( * 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; Index: ncgen/load.c =================================================================== --- ncgen/load.c.orig 2008-07-25 20:50:55.000000000 +0200 +++ ncgen/load.c 2010-11-30 12:18:31.944884840 +0100 @@ -13,6 +13,10 @@ #include "ncgen.h" #include "genlib.h" +#ifndef HAVE_STRLCAT +extern size_t strlcat(char *dst, const char *src, size_t siz); +#endif + extern int netcdf_flag; extern int c_flag; extern int fortran_flag; ++++++ netcdf-correct_casting.patch ++++++ Index: libsrc/posixio.c =================================================================== --- libsrc/posixio.c.orig 2008-10-07 22:33:55.000000000 +0200 +++ libsrc/posixio.c 2010-11-29 18:41:22.570492743 +0100 @@ -603,7 +603,7 @@ done: pxp->bf_rflags |= rflags; pxp->bf_refcount++; - *vpp = (char *)pxp->bf_base + diff; + *vpp = (void *)((char *)pxp->bf_base + diff); return ENOERR; } ++++++ netcdf-no_date_time.patch ++++++ Index: libsrc/libvers.c =================================================================== --- libsrc/libvers.c.orig 2009-02-03 02:59:30.000000000 +0100 +++ libsrc/libvers.c 2010-11-30 19:11:56.155357513 +0100 @@ -17,7 +17,7 @@ #define XSTRING(x) #x #define STRING(x) XSTRING(x) static const char nc_libvers[] = - "\044Id: \100(#) netcdf library version " STRING(VERSION) " of "__DATE__" "__TIME__" $"; + "\044Id: \100(#) netcdf library version " STRING(VERSION) " $"; const char * nc_inq_libvers(void) Index: libsrc4/ncfunc.c =================================================================== --- libsrc4/ncfunc.c.orig 2009-03-18 15:08:50.000000000 +0100 +++ libsrc4/ncfunc.c 2010-11-30 19:11:39.017300584 +0100 @@ -19,7 +19,7 @@ $Id: ncfunc.c,v 1.42 2009/03/18 14:08:50 extern NC_FILE_INFO_T *nc_file; /* 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) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
