Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2012-03-22 12:36:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-09-23 02:14:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf.new/netcdf.changes 2012-03-22 12:36:34.000000000 +0100 @@ -1,0 +2,46 @@ +Fri Mar 16 15:55:13 UTC 2012 - [email protected] + +- license update: SUSE-NetCDF + Use SPDX- proprietary prefix until this license is accepted upstream by + spdx.org + +------------------------------------------------------------------- +Wed Nov 30 13:43:18 UTC 2011 - [email protected] + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Use %_smp_mflags for parallel building +- Appropriate rpmgroups for shlib packages + +------------------------------------------------------------------- +Tue Nov 29 19:18:45 UTC 2011 - [email protected] + +- Added explicit hdf5 dependency. +- Rebuild with hdf5 1.8.8 +- Some spec file clean-ups. + +------------------------------------------------------------------- +Sun Jun 26 02:02:57 UTC 2011 - [email protected] + +- Added pkgconfig and fflags patches +- Dropped libm patch fixed upstream +- Fixed summary, license info, description +- Created doc and static packages + +------------------------------------------------------------------- +Sun Jun 26 01:31:36 UTC 2011 - [email protected] + +- updated to 4.1.3 + +------------------------------------------------------------------- +Thu Jun 2 20:43:32 UTC 2011 - [email protected] + +- rename libnetcdf-devel to netcdf-devel as recommended by pth + +------------------------------------------------------------------- +Fri Apr 29 16:21:24 UTC 2011 - [email protected] + +- updated to version 4.1.2 +- added flag --enable-dap for OpenDap support +- updated the patches + +------------------------------------------------------------------- Old: ---- netcdf-4.0.1-delete.patch netcdf-4.0.1-dependencies.patch netcdf-4.0.1.tar.bz2 New: ---- netcdf-4.1.3.tar.bz2 netcdf-dependencies.patch netcdf-fflags.patch netcdf-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.xG2rN6/_old 2012-03-22 12:36:39.000000000 +0100 +++ /var/tmp/diff_new_pack.xG2rN6/_new 2012-03-22 12:36:39.000000000 +0100 @@ -15,47 +15,84 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define ncdf_so_major 4 Name: netcdf -Summary: Library for Array Oriented Data Access -Version: 4.0.1 -Release: 12 +Summary: Libraries for the Unidata network Common Data Form +Version: 4.1.3 +Release: 0 Group: System/Libraries -License: MIT License (or similar) -Url: http://www.unidata.ucar.edu/software/netcdf/ +License: SUSE-NetCDF +URL: http://www.unidata.ucar.edu/software/netcdf/ Source: %{name}-%{version}.tar.bz2 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 +Patch0: %{name}-correct_casting.patch +Patch1: %{name}-dependencies.patch +Patch2: %{name}-codecleanup.patch +Patch3: %{name}-no_date_time.patch +#Strip FFLAGS from nc-config +#Use pkgconfig in nc-config to avoid multi-lib issues +Patch4: netcdf-pkgconfig.patch +#Strip FFLAGS from nc-config +Patch6: netcdf-fflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ gcc-fortran +BuildRequires: gawk gcc-c++ gcc-fortran +BuildRequires: pkg-config zlib-devel +BuildRequires: hdf5-devel >= 1.8.4 +BuildRequires: libcurl-devel +%ifnarch s390 s390x +BuildRequires: valgrind +%endif PreReq: %install_info_prereq +Requires: hdf5 %description -This library provides array-oriented data access for the languages C -and C++. +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: + + o Self-Describing: A NetCDF file includes information about the + data it contains. + + o Network-transparent: A NetCDF file is represented in a form that + can be accessed by computers with different ways of storing + integers, characters, and floating-point numbers. + + o Direct-access: A small subset of a large dataset may be accessed + efficiently, without first reading through all the preceding + data. + + o Appendable: Data can be appended to a NetCDF dataset along one + dimension without copying the dataset or redefining its + structure. The structure of a NetCDF dataset can be changed, + though this sometimes causes the dataset to be copied. + o Sharable: One writer and multiple readers may simultaneously + access the same NetCDF file. +%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: pkgconfig -Authors: --------- - Glenn Davis - Russ Rew - Steve Emmerson - Harvey Davies <[email protected]> +%description devel +This package contains the netCDF header files, shared devel libs, and +man pages. %package -n libnetcdf%{ncdf_so_major} - - -License: MIT License (or similar) Summary: Library for Array Oriented Data Access -Group: Development/Libraries/C and C++ +Group: System/Libraries Provides: libnetcdf-4 = %{version} Obsoletes: libnetcdf-4 < %{version} @@ -63,43 +100,29 @@ This library provides array-oriented data access for the languages C and C++. +%package doc +Summary: Documentation for netcdf +Group: Documentation/Other +%description doc +Documentation files of for netcdf -Authors: --------- - Glenn Davis - Russ Rew - Steve Emmerson - Harvey Davies <[email protected]> - -%package -n libnetcdf-devel -License: MIT License (or similar) -Summary: Library for Array Oriented Data Access +%package devel-static +Summary: Static libs for netcdf Group: Development/Libraries/C and C++ -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 -and C++. - +Requires: %{name} = %{version}-%{release} - -Authors: --------- - Glenn Davis - Russ Rew - Steve Emmerson - Harvey Davies <[email protected]> +%description devel-static +This package contains the netCDF static libs. %prep %setup -q -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 +%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 %build export CC=gcc CXX=g++ FC=gfortran \ @@ -107,56 +130,82 @@ %configure \ --enable-shared \ - --disable-static \ - --with-pic -make %{?jobs:-j %jobs} + --enable-netcdf-4 \ + --enable-dap \ + --enable-ncgen4 \ + --enable-extra-example-tests \ + --disable-dap-remote-tests \ + --with-pic \ + --enable-static +# %%ifnarch s390 s390x +# --enable-valgrind-tests \ +# %%endif + +make %{?_smp_mflags} %install %makeinstall +# make install DESTDIR=%%{buildroot} 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 %{buildroot} +%check +make check -%post -n libnetcdf-devel +%post devel for i in netcdf-c netcdf-tutorial netcdf-f90 netcdf-f77 netcdf-install netcdf netcdf-cxx; do %install_info --info-dir=%{_infodir} %{_infodir}/$i.info.gz done -%postun -n libnetcdf-devel +%postun devel for i in netcdf-c netcdf-tutorial netcdf-f90 netcdf-f77 netcdf-install netcdf netcdf-cxx; do %install_info_delete --info-dir=%{_infodir} %{_infodir}/$i.info.gz done +%post doc +/sbin/install-info %{_infodir}/netcdf.info %{_infodir}/dir 2>/dev/null || : + +%postun doc +if [ "$1" = 0 ]; then + /sbin/install-info --delete %{_infodir}/netcdf.info \ + %{_infodir}/dir 2>/dev/null || : +fi + %post -n libnetcdf%{ncdf_so_major} -p /sbin/ldconfig %postun -n libnetcdf%{ncdf_so_major} -p /sbin/ldconfig %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc COPYRIGHT README RELEASE_NOTES %{_bindir}/* %exclude %{_bindir}/nc-config %{_mandir}/man1/* -%exclude %{_mandir}/man1/nc-config.1.gz +%exclude %{_mandir}/man1/*.1.gz -%files -n libnetcdf-devel -%defattr(-,root,root) +%files 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 libnetcdf%{ncdf_so_major} -%defattr(-,root,root) +%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 + %changelog ++++++ netcdf-4.0.1.tar.bz2 -> netcdf-4.1.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/netcdf/netcdf-4.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.netcdf.new/netcdf-4.1.3.tar.bz2 differ: char 11, line 1 ++++++ netcdf-codecleanup.patch ++++++ --- /var/tmp/diff_new_pack.xG2rN6/_old 2012-03-22 12:36:39.000000000 +0100 +++ /var/tmp/diff_new_pack.xG2rN6/_new 2012-03-22 12:36:39.000000000 +0100 @@ -1,26 +1,7 @@ -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( +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. */ @@ -29,10 +10,9 @@ 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 +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 @@ -13,6 +13,10 @@ #include "ncgen.h" #include "genlib.h" ++++++ netcdf-correct_casting.patch ++++++ --- /var/tmp/diff_new_pack.xG2rN6/_old 2012-03-22 12:36:39.000000000 +0100 +++ /var/tmp/diff_new_pack.xG2rN6/_new 2012-03-22 12:36:39.000000000 +0100 @@ -1,8 +1,6 @@ -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: +--- 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 @@ pxp->bf_rflags |= rflags; pxp->bf_refcount++; ++++++ netcdf-dependencies.patch ++++++ diff -Naur netcdf-4.1.2.orig/f90/Makefile.am netcdf-4.1.2/f90/Makefile.am --- netcdf-4.1.2.orig/f90/Makefile.am 2011-04-29 11:28:29.578791212 -0400 +++ netcdf-4.1.2/f90/Makefile.am 2011-04-29 11:31:13.751738767 -0400 @@ -41,7 +41,7 @@ netcdf4_visibility.f90 netcdf4_constants.f90 netcdf4.f90 \ netcdf4_eightbyte.f90 netcdf4_variables.f90 netcdf4_file.f90 -NETCDF_O = netcdf4.o +NETCDF_O = netcdf4.lo else # not USE_NETCDF4 @@ -49,7 +49,7 @@ libnetcdff90_la_SOURCES += netcdf.f90 libnetcdff90_la_DEPENDENCIES += netcdf.f90 netcdf3_file.f90 -NETCDF_O = netcdf.o +NETCDF_O = netcdf.lo endif # USE_NETCDF4 @@ -57,13 +57,15 @@ # uppercase. Just to be special. if UPPER_CASE_MOD nodist_include_HEADERS = TYPESIZES.mod NETCDF.mod -TYPESIZES.mod: typeSizes.o +TYPESIZES.mod: typeSizes.lo NETCDF.mod: $(NETCDF_O) +$(NETCDF_O): TYPESIZES.mod BUILT_SOURCES = TYPESIZES.mod else nodist_include_HEADERS = typesizes.mod netcdf.mod -typesizes.mod: typeSizes.o +typesizes.mod: typeSizes.lo netcdf.mod: $(NETCDF_O) +$(NETCDF_O): typesizes.mod BUILT_SOURCES = typesizes.mod endif diff -Naur netcdf-4.1.2.orig/f90/Makefile.in netcdf-4.1.2/f90/Makefile.in --- netcdf-4.1.2.orig/f90/Makefile.in 2011-04-29 11:28:29.579791199 -0400 +++ netcdf-4.1.2/f90/Makefile.in 2011-04-29 11:34:44.097109088 -0400 @@ -317,8 +317,8 @@ netcdf_text_variables.f90 netcdf_variables.f90 \ netcdf_visibility.f90 netcdf_eightbyte.f90 $(am__append_2) \ $(am__append_4) -@USE_NETCDF4_FALSE@NETCDF_O = netcdf.o -@USE_NETCDF4_TRUE@NETCDF_O = netcdf4.o +@USE_NETCDF4_FALSE@NETCDF_O = netcdf.lo +@USE_NETCDF4_TRUE@NETCDF_O = netcdf4.lo @UPPER_CASE_MOD_FALSE@nodist_include_HEADERS = typesizes.mod netcdf.mod # Some fortran compilers change the file names of .mod files to all @@ -675,10 +675,12 @@ tags uninstall uninstall-am uninstall-man uninstall-man3 \ uninstall-nodist_includeHEADERS -@[email protected]: typeSizes.o +@[email protected]: typeSizes.lo @[email protected]: $(NETCDF_O) -@[email protected]: typeSizes.o +@UPPER_CASE_MOD_TRUE@$(NETCDF_O): TYPESIZES.mod +@[email protected]: typeSizes.lo @[email protected]: $(NETCDF_O) +@UPPER_CASE_MOD_FALSE@$(NETCDF_O): typesizes.mod # Turn of parallel builds in this directory. .NOTPARALLEL: ++++++ netcdf-fflags.patch ++++++ diff -up netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.fflags netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in --- netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.fflags 2011-05-27 15:05:06.000000000 -0600 +++ netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in 2011-05-27 15:06:08.066331777 -0600 @@ -14,7 +14,7 @@ cc="@CC@" cxx="@CXX@" fc="@FC@" cflags=" -I${includedir} @CPPFLAGS@" -fflags="@FFLAGS@ @MOD_FLAG@${includedir}" +fflags="@MOD_FLAG@${includedir}" has_dap="@HAS_DAP@" has_nc2="@HAS_NC2@" has_nc4="@HAS_NC4@" ++++++ netcdf-no_date_time.patch ++++++ --- /var/tmp/diff_new_pack.xG2rN6/_old 2012-03-22 12:36:39.000000000 +0100 +++ /var/tmp/diff_new_pack.xG2rN6/_new 2012-03-22 12:36:39.000000000 +0100 @@ -1,22 +1,7 @@ -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; +--- 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 @@ + #include "ncdispatch.h" /* Tell the user the version of netCDF. */ -static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $"; ++++++ netcdf-pkgconfig.patch ++++++ diff -up netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.pkgconfig netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in --- netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in.pkgconfig 2011-05-26 20:23:15.000000000 -0600 +++ netcdf-4.1.3-rc1-snapshot2011052620/nc-config.in 2011-05-27 15:04:12.823601895 -0600 @@ -8,7 +8,6 @@ prefix=@prefix@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib includedir=${prefix}/include cc="@CC@" @@ -16,8 +15,6 @@ cxx="@CXX@" fc="@FC@" cflags=" -I${includedir} @CPPFLAGS@" fflags="@FFLAGS@ @MOD_FLAG@${includedir}" -libs="-L${libdir} @NC_LIBS@" -flibs="-L${libdir} @NC_FLIBS@" has_dap="@HAS_DAP@" has_nc2="@HAS_NC2@" has_nc4="@HAS_NC4@" @@ -141,11 +138,11 @@ while test $# -gt 0; do ;; --libs) - echo $libs + pkg-config netcdf --libs ;; --flibs) - echo $flibs + pkg-config netcdf --flibs ;; --has-dap) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
