From 704887a134d46f6e67185d32efb49f7a8b4101ee Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 17 Feb 2019 20:36:47 +0100 Subject: [PATCH] upgrade to version 2.12.0 --- .gitignore | 1 + eccodes-32bit.patch | 10 +++++----- eccodes-rpath.patch | 4 ++-- eccodes-soversion.patch | 10 +++++----- eccodes.spec | 39 ++++++++++++++++++++------------------- sources | 5 +---- 6 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index ffbff0a..a918987 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /eccodes-2.9.0-Source.tar.gz /eccodes_test_data_20181010.tar.gz /eccodes-2.9.2-Source.tar.gz +/eccodes-2.12.0-Source.tar.gz diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch index 76fbedf..0732acf 100644 --- a/eccodes-32bit.patch +++ b/eccodes-32bit.patch @@ -1,6 +1,6 @@ ---- eccodes-2.9.2-Source.orig/src/grib_api_prototypes.h 2018-11-09 15:55:26.000000000 +0100 -+++ eccodes-2.9.2-Source/src/grib_api_prototypes.h 2018-11-24 15:06:47.892920252 +0100 -@@ -869,8 +869,8 @@ double grib_ieeefloat_error(double x); +--- eccodes-2.12.0-Source.orig/src/grib_api_prototypes.h 2019-02-15 10:44:55.000000000 +0100 ++++ eccodes-2.12.0-Source/src/grib_api_prototypes.h 2019-02-17 17:16:20.867656748 +0100 +@@ -871,8 +871,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); unsigned long grib_ieee_to_long(double x); @@ -11,8 +11,8 @@ 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.9.2-Source.orig/src/grib_ieeefloat.c 2018-11-09 15:55:26.000000000 +0100 -+++ eccodes-2.9.2-Source/src/grib_ieeefloat.c 2018-11-24 15:06:47.892920252 +0100 +--- eccodes-2.12.0-Source.orig/src/grib_ieeefloat.c 2019-02-15 10:44:55.000000000 +0100 ++++ eccodes-2.12.0-Source/src/grib_ieeefloat.c 2019-02-17 17:16:20.868656722 +0100 @@ -392,14 +392,14 @@ unsigned long grib_ieee_to_long(double x * grib_encode_unsigned_long. */ diff --git a/eccodes-rpath.patch b/eccodes-rpath.patch index c459067..bf7fc90 100644 --- a/eccodes-rpath.patch +++ b/eccodes-rpath.patch @@ -1,5 +1,5 @@ ---- eccodes-2.7.0-Source.orig/cmake/pkg-config.pc.in 2018-03-02 10:52:15.000000000 +0100 -+++ eccodes-2.7.0-Source/cmake/pkg-config.pc.in 2018-03-10 10:16:43.852822378 +0100 +--- eccodes-2.12.0-Source.orig/cmake/pkg-config.pc.in 2019-02-15 10:44:50.000000000 +0100 ++++ eccodes-2.12.0-Source/cmake/pkg-config.pc.in 2019-02-17 17:16:25.490537820 +0100 @@ -14,9 +14,7 @@ CC=@CMAKE_C_COMPILER@ CXX=@CMAKE_CXX_COMPILER@ FC=@CMAKE_Fortran_COMPILER@ diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index e91210e..9ef6c43 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.7.0-Source.orig/fortran/CMakeLists.txt 2018-03-02 10:52:20.000000000 +0100 -+++ eccodes-2.7.0-Source/fortran/CMakeLists.txt 2018-03-10 10:16:43.847822505 +0100 +--- eccodes-2.12.0-Source.orig/fortran/CMakeLists.txt 2019-02-15 10:44:55.000000000 +0100 ++++ eccodes-2.12.0-Source/fortran/CMakeLists.txt 2019-02-17 17:16:23.108599099 +0100 @@ -43,7 +43,8 @@ if( HAVE_FORTRAN ) ecbuild_add_library( TARGET eccodes_f90 SOURCES grib_fortran.c grib_f90.f90 eccodes_f90.f90 grib_kinds.h @@ -10,9 +10,9 @@ add_custom_command( TARGET eccodes_f90 POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/include COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/eccodes.mod ${CMAKE_BINARY_DIR}/include ---- eccodes-2.7.0-Source.orig/src/CMakeLists.txt 2018-03-02 10:52:20.000000000 +0100 -+++ eccodes-2.7.0-Source/src/CMakeLists.txt 2018-03-10 10:16:43.848822480 +0100 -@@ -435,8 +435,8 @@ ecbuild_add_library(TARGET eccodes +--- eccodes-2.12.0-Source.orig/src/CMakeLists.txt 2019-02-15 10:44:55.000000000 +0100 ++++ eccodes-2.12.0-Source/src/CMakeLists.txt 2019-02-17 17:16:23.109599073 +0100 +@@ -436,8 +436,8 @@ ecbuild_add_library(TARGET eccodes ${grib_api_srcs} GENERATED grib_api_version.c LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES} diff --git a/eccodes.spec b/eccodes.spec index 3ea576c..6157e0c 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.9.2 -Release: 2%{?dist} +Version: 2.12.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -39,9 +39,11 @@ Patch1: eccodes-32bit.patch Patch2: eccodes-soversion.patch # remove rpath from cmake/pkg-config.pc.in Patch3: eccodes-rpath.patch + +# disabled # fix compile flags in fortran checks # this is needed due to rpath removal -Patch4: eccodes-fortran-check.patch +#Patch4: eccodes-fortran-check.patch # note that the requests to make the other issues public are filed here: # https://software.ecmwf.int/issues/browse/SUP-2073 @@ -87,16 +89,17 @@ Requires: %{name}-data = %{version}-%{release} Obsoletes: grib_api < %{final_grib_api_version} +# disabled for my first scratch build as usual, to see what happens # as explained in bugzilla #1562066 -ExcludeArch: i686 +#ExcludeArch: i686 # as explained in bugzilla #1562071 # note: this is no longer part of fc30/rawhide # but the exclude is still needed for EPEL-7 -ExcludeArch: ppc64 +#ExcludeArch: ppc64 # as explained in bugzilla #1562076 -ExcludeArch: s390x +#ExcludeArch: s390x # as explained in bugzilla #1562084 -ExcludeArch: armv7hl +#ExcludeArch: armv7hl %if 0%{?rhel} >= 7 # as explained in bugzilla #1629377 @@ -137,11 +140,9 @@ and behaviour. A significant difference compared with GRIB-API tools is that bufr_dump produces output in JSON format suitable for many web based applications. -(1) Note: for now only a python2 interface is provided by upstream, -and since Fedora is phasing out python2 this interface has -been removed from this package starting with Fedora 30. -As soon as upstream provides a python3 interface that one will -be added here. +(1) Note: the python3 interface is provided by upstream, +but it fails unittesting, so it has been disabled for now. +As soon as this is fixed by upstream it will be added here. ##################################################### %package devel @@ -196,11 +197,9 @@ This package contains the html documentation for ecCodes and a fair number of example programs and scripts to use it in C, Fortran 90, and Python (1). -(1) Note: for now only a python2 interface is provided by upstream, -and since Fedora is phasing out python2 this interface has -been removed from this package starting with Fedora 30. -As soon as upstream provides a python3 interface that one will -be added here. +(1) Note: the python3 interface is provided by upstream, +but it fails unittesting, so it has been disabled for now. +As soon as this is fixed by upstream it will be added here. ##################################################### %prep @@ -333,7 +332,7 @@ ctest3 -V %{?_smp_mflags} %files %license LICENSE -%doc README ChangeLog AUTHORS +%doc README.md ChangeLog AUTHORS NEWS NOTICE %{_bindir}/* %{_libdir}/*.so.* @@ -362,10 +361,12 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Feb 17 2019 Jos de Kloe - 2.12.0-1 +- Upgrade to upstream version 2.12.0 + * Thu Jan 31 2019 Fedora Release Engineering - 2.9.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Sat Nov 24 2018 Jos de Kloe - 2.9.2-1 - Upgrade to upstream version 2.9.2 diff --git a/sources b/sources index 7b2c40f..1747407 100644 --- a/sources +++ b/sources @@ -1,5 +1,2 @@ -SHA512 (eccodes-2.8.2-Source.tar.gz) = 942de24390df9de64a768e2f351c9acef5b0550a59695016b9753b22fbff260f8a6f9780240dbb2402bec372ee4c8224a68f3d70699a5df42b23c0a4c073114d -SHA512 (eccodes_test_data.tar.gz) = 0f13137584525f12e184068501cc13a58fb8bb16ada680ca7f1575c6066fd2bc5995ec7afffb175c38958e71d991cea4b3972ad01402b54d2550e442241ffc7b -SHA512 (eccodes-2.9.0-Source.tar.gz) = c485255d85d78600fbb4828d9d6eaf2e03a425b7eb8fe5cb1a5f5f822df8b830eddeaa06013327ca1f7247b0012e1ee78814a164a5ccf4b1e90c1a62a35431ea SHA512 (eccodes_test_data_20181010.tar.gz) = 24c24ec9e01d230cf542abe5c131f05b8e627dd9d170c666628bb5fd8f7b1a6aa11a35456b8d742c59f54c6aabac78658efd68b0c50779d466aba3d35b4a0231 -SHA512 (eccodes-2.9.2-Source.tar.gz) = 94d077bb0f348c4d64883a4f0877439c123786c73d2b64e4bdfb3f7eb28e445ff1e0eeb57140261906b8aef8e22fd3d614528f1821877ebe6bcb9d38393921d9 +SHA512 (eccodes-2.12.0-Source.tar.gz) = 3dc876bde2a6c81a43bcc64ecb12969f28eae3cfbc8fed7da7797fc722dc8b446ac7be5178f55b7d395653e0718437b842296a7d4d11b372b8692404c76aa4ad