diff --git a/.gitignore b/.gitignore index 9ffefd3..3124fa2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /eccodes-2.14.1-Source.tar.gz /eccodes-2.15.0-Source.tar.gz /eccodes-2.16.0-Source.tar.gz +/eccodes-2.17.0-Source.tar.gz diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch index f8369bb..c6fcc2a 100644 --- a/eccodes-32bit.patch +++ b/eccodes-32bit.patch @@ -1,19 +1,19 @@ ---- eccodes-2.16.0-Source.unchanged/src/grib_api_prototypes.h 2020-01-14 10:53:35.000000000 +0100 -+++ eccodes-2.16.0-Source/src/grib_api_prototypes.h 2020-02-08 16:14:04.100982991 +0100 +--- eccodes-2.17.0-Source.unchanged/src/grib_api_prototypes.h 2020-03-09 11:17:48.000000000 +0100 ++++ eccodes-2.17.0-Source/src/grib_api_prototypes.h 2020-03-14 11:59:43.493457319 +0100 @@ -873,8 +873,8 @@ double grib_ieeefloat_error(double x); double grib_long_to_ieee(unsigned long x); - int grib_nearest_smaller_ieee_float(double a, double *x); + int grib_nearest_smaller_ieee_float(double a, double* x); unsigned long grib_ieee_to_long(double x); -unsigned long grib_ieee64_to_long(double x); -double grib_long_to_ieee64(unsigned long x); +uint64_t grib_ieee64_to_long(double x); +double grib_long_to_ieee64(uint64_t x); - int grib_ieee_decode_array(grib_context *c, unsigned char *buf, size_t nvals, int bytes, double *val); - int grib_ieee_decode_array(grib_context *c, unsigned char *buf, size_t nvals, int bytes, double *val); - int grib_ieee_encode_array(grib_context *c, double *val, size_t nvals, int bytes, unsigned char *buf); ---- eccodes-2.16.0-Source.unchanged/src/grib_ieeefloat.c 2020-01-14 10:53:35.000000000 +0100 -+++ eccodes-2.16.0-Source/src/grib_ieeefloat.c 2020-02-08 16:14:04.104982891 +0100 -@@ -392,14 +392,14 @@ unsigned long grib_ieee_to_long(double x + int grib_ieee_decode_array(grib_context* c, unsigned char* buf, size_t nvals, int bytes, double* val); + int grib_ieee_decode_array(grib_context* c, unsigned char* buf, size_t nvals, int bytes, double* val); + int grib_ieee_encode_array(grib_context* c, double* val, size_t nvals, int bytes, unsigned char* buf); +--- eccodes-2.17.0-Source.unchanged/src/grib_ieeefloat.c 2020-03-09 11:17:48.000000000 +0100 ++++ eccodes-2.17.0-Source/src/grib_ieeefloat.c 2020-03-14 12:07:45.848470121 +0100 +@@ -443,14 +443,14 @@ unsigned long grib_ieee_to_long(double x * grib_encode_unsigned_long. */ @@ -21,12 +21,12 @@ +uint64_t grib_ieee64_to_long(double x) { unsigned long lval; - memcpy(&lval,&x,8); + memcpy(&lval, &x, 8); return lval; } --double grib_long_to_ieee64 (unsigned long x) +-double grib_long_to_ieee64(unsigned long x) +double grib_long_to_ieee64(uint64_t x) { double dval; - memcpy(&dval,&x,8); + memcpy(&dval, &x, 8); diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 9ed4d4e..4d576e3 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.16.0-Source.unchanged/fortran/CMakeLists.txt 2020-01-14 10:53:35.000000000 +0100 -+++ eccodes-2.16.0-Source/fortran/CMakeLists.txt 2020-02-08 16:14:13.161755451 +0100 +--- eccodes-2.17.0-Source.unchanged/fortran/CMakeLists.txt 2020-03-09 11:17:48.000000000 +0100 ++++ eccodes-2.17.0-Source/fortran/CMakeLists.txt 2020-03-14 11:55:27.233680557 +0100 @@ -43,7 +43,9 @@ if( HAVE_FORTRAN ) ecbuild_add_library( TARGET eccodes_f90 SOURCES grib_fortran.c grib_f90.f90 eccodes_f90.f90 grib_kinds.h @@ -11,8 +11,8 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! target_include_directories( eccodes_f90 PUBLIC $ ) ---- eccodes-2.16.0-Source.unchanged/src/CMakeLists.txt 2020-01-14 10:53:35.000000000 +0100 -+++ eccodes-2.16.0-Source/src/CMakeLists.txt 2020-02-08 16:14:13.169755250 +0100 +--- eccodes-2.17.0-Source.unchanged/src/CMakeLists.txt 2020-03-09 11:17:48.000000000 +0100 ++++ eccodes-2.17.0-Source/src/CMakeLists.txt 2020-03-14 11:55:27.236680482 +0100 @@ -438,6 +438,7 @@ ecbuild_add_library(TARGET eccodes GENERATED grib_api_version.c LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES} diff --git a/eccodes.spec b/eccodes.spec index 94cf7df..ccbbb6c 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.16.0 +Version: 2.17.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -62,6 +62,7 @@ BuildRequires: openjpeg2-devel # For tests BuildRequires: perl(Getopt::Long) BuildRequires: perl(Test::More) +BuildRequires: perl(File::Compare) # the data is needed by the library and all tools provided in the main package # the other way around, the data package could be installed without @@ -347,6 +348,10 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Mar 15 2020 Jos de Kloe - 2.17.0-1 +- Upgrade to upstream version 2.17.0 +- Add explcit BR to perl(File::Compare) as needed by the tests now + * Sat Feb 08 2020 Jos de Kloe - 2.16.0-1 - Upgrade to upstream version 2.16.0 diff --git a/sources b/sources index 6566d02..ca8d489 100644 --- a/sources +++ b/sources @@ -5,3 +5,4 @@ SHA512 (eccodes-2.13.0-Source.tar.gz) = bbde1b7092caad20772b21cd06040938f99e763f SHA512 (eccodes-2.14.1-Source.tar.gz) = 864b530642884baa0c3c56eee646a61af7d659e711c7ed4d08a5cc2d68812ecb96b8efabf40c4c9d5dcb3a0edeb1caddffea2ec3438571d3e90dc9cca1dabebe SHA512 (eccodes-2.15.0-Source.tar.gz) = 1d906c5889773b4b6c5e9a967c2e20afb4ecc3ce8f4d496ad7b89417eec8783da9a0c8a9c14796f0c9c24b1f156b9d65408bb9a02a5e0c988a45478350aeae65 SHA512 (eccodes-2.16.0-Source.tar.gz) = 6e8768824152d8782c1457cfe79daed32114d1b4694d2843bd02a8aa63c42ccc435b53f7db6942239b3e56999fbaaba4ecef345d39fc5c5f7a5d20ceecf4422a +SHA512 (eccodes-2.17.0-Source.tar.gz) = 362c6ae23c23326a3a969c6ba109bdf96ba449cba899030a69efb03e53870f6c90e3f6dbf9d0d2f94febf3a661e607390e8b16d58e64066c4fa941af554ebee7