From 72110692aa1b3da95919b0d4b04589ae6596d21e Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 20 Sep 2018 08:57:01 +0200 Subject: [PATCH 01/90] add a line to run the problematic test on epel7 and dump the result is a log file --- eccodes.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/eccodes.spec b/eccodes.spec index 483b989..78b905b 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -331,6 +331,7 @@ cd build # (unfortunately this issue is not public) LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ LIBRARY_PATH=%{buildroot}/%{_libdir} \ +ctest3 -V %{?_smp_mflags} -R eccodes_t_bufr_dump_encode_C > output_test_98_eccodes_t_bufr_dump_encode_C.log ctest3 -V %{?_smp_mflags} %files From 543ba24a4824ef51570629fdcb818f3620355917 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 20 Sep 2018 08:58:55 +0200 Subject: [PATCH 02/90] and enable the aarch64 case again ... --- eccodes.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index 78b905b..197d169 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -100,10 +100,10 @@ ExcludeArch: s390x # as explained in bugzilla #1562084 ExcludeArch: armv7hl -%if 0%{?rhel} >= 7 -# as explained in bugzilla #1629377 -ExcludeArch: aarch64 -%endif +#%if 0%%{?rhel} >= 7 +## as explained in bugzilla #1629377 +#ExcludeArch: aarch64 +#%%endif %description ecCodes is a package developed by ECMWF which provides an application From ca45d522790280600e64e647443e3cc9d375c83e Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 20 Sep 2018 09:28:28 +0200 Subject: [PATCH 03/90] try again --- eccodes.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index 197d169..c94b0f9 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -329,10 +329,13 @@ cd build # so a patch has been added to solve this for now. # See: https://software.ecmwf.int/issues/browse/SUP-1812 # (unfortunately this issue is not public) +echo "------ START DEBUG OUTPUT" LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ LIBRARY_PATH=%{buildroot}/%{_libdir} \ -ctest3 -V %{?_smp_mflags} -R eccodes_t_bufr_dump_encode_C > output_test_98_eccodes_t_bufr_dump_encode_C.log -ctest3 -V %{?_smp_mflags} +ECCODES_TEST_VERBOSE_OUTPUT=1 ECCODES_DEBUG=1 \ +ctest3 -VV %{?_smp_mflags} -R eccodes_t_bufr_dump_encode_C > output_test_98_eccodes_t_bufr_dump_encode_C.log +echo "------ END DEBUG OUTPUT" +# ctest3 -V %%{?_smp_mflags} %files %license LICENSE From 563a940cd3b48e7c9e02d02ee4d531f64b85a9a6 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 20 Sep 2018 10:23:32 +0200 Subject: [PATCH 04/90] and try once more --- eccodes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index c94b0f9..31314d9 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -333,7 +333,7 @@ echo "------ START DEBUG OUTPUT" LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ LIBRARY_PATH=%{buildroot}/%{_libdir} \ ECCODES_TEST_VERBOSE_OUTPUT=1 ECCODES_DEBUG=1 \ -ctest3 -VV %{?_smp_mflags} -R eccodes_t_bufr_dump_encode_C > output_test_98_eccodes_t_bufr_dump_encode_C.log +ctest3 -VV %{?_smp_mflags} -R eccodes_t_bufr_dump_encode_C echo "------ END DEBUG OUTPUT" # ctest3 -V %%{?_smp_mflags} From 5be33312603acd8fb7216abe2def2dfac1c76986 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 20 Sep 2018 10:47:52 +0200 Subject: [PATCH 05/90] next try --- eccodes.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 31314d9..05ea7f7 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -332,7 +332,6 @@ cd build echo "------ START DEBUG OUTPUT" LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ LIBRARY_PATH=%{buildroot}/%{_libdir} \ -ECCODES_TEST_VERBOSE_OUTPUT=1 ECCODES_DEBUG=1 \ ctest3 -VV %{?_smp_mflags} -R eccodes_t_bufr_dump_encode_C echo "------ END DEBUG OUTPUT" # ctest3 -V %%{?_smp_mflags} From eb84fd68e591acff2955aabcd3d9c6d8b3f8b303 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 20 Sep 2018 11:35:00 +0200 Subject: [PATCH 06/90] revert insertion of debug code --- eccodes.spec | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index 05ea7f7..483b989 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -100,10 +100,10 @@ ExcludeArch: s390x # as explained in bugzilla #1562084 ExcludeArch: armv7hl -#%if 0%%{?rhel} >= 7 -## as explained in bugzilla #1629377 -#ExcludeArch: aarch64 -#%%endif +%if 0%{?rhel} >= 7 +# as explained in bugzilla #1629377 +ExcludeArch: aarch64 +%endif %description ecCodes is a package developed by ECMWF which provides an application @@ -329,12 +329,9 @@ cd build # so a patch has been added to solve this for now. # See: https://software.ecmwf.int/issues/browse/SUP-1812 # (unfortunately this issue is not public) -echo "------ START DEBUG OUTPUT" LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ LIBRARY_PATH=%{buildroot}/%{_libdir} \ -ctest3 -VV %{?_smp_mflags} -R eccodes_t_bufr_dump_encode_C -echo "------ END DEBUG OUTPUT" -# ctest3 -V %%{?_smp_mflags} +ctest3 -V %{?_smp_mflags} %files %license LICENSE From 1b35c600b0701c4493cdacc2bfc8e8fc34d4e15b Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 17 Sep 2019 09:45:57 -0500 Subject: [PATCH 07/90] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 78fe5405970a4fdacf622c066533c855c8c18dcf Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 27 Oct 2019 15:42:17 +0100 Subject: [PATCH 08/90] updated to upstream version 2.14.1 --- .gitignore | 4 ++ README.md | 13 +++- eccodes-32bit.patch | 10 +-- eccodes-soversion.patch | 32 +++++---- eccodes.spec | 141 ++++++++++++++++++---------------------- 5 files changed, 100 insertions(+), 100 deletions(-) diff --git a/.gitignore b/.gitignore index ffbff0a..17470ea 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ /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 +/eccodes-2.12.5-Source.tar.gz +/eccodes-2.13.0-Source.tar.gz +/eccodes-2.14.1-Source.tar.gz diff --git a/README.md b/README.md index df5cd52..035f9e0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,14 @@ # eccodes -The eccodes package \ No newline at end of file +The eccodes package. + +EcCodes is a package developed by ECMWF which provides an application +programming interface and a set of tools for decoding and encoding +messages in the following formats: + + * WMO FM-92 GRIB edition 1 and edition 2 + * WMO FM-94 BUFR edition 3 and edition 4 + * WMO GTS abbreviated header (only decoding). + +For further details see: +https://confluence.ecmwf.int/display/ECC/What+is+ecCodes diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch index 76fbedf..3f116e7 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.14.1-Source.unchanged/src/grib_api_prototypes.h 2019-10-10 13:33:52.000000000 +0200 ++++ eccodes-2.14.1-Source/src/grib_api_prototypes.h 2019-10-27 11:20:05.496702520 +0100 +@@ -872,8 +872,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.14.1-Source.unchanged/src/grib_ieeefloat.c 2019-10-10 13:33:52.000000000 +0200 ++++ eccodes-2.14.1-Source/src/grib_ieeefloat.c 2019-10-27 11:20:05.497702497 +0100 @@ -392,14 +392,14 @@ unsigned long grib_ieee_to_long(double x * grib_encode_unsigned_long. */ diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index e91210e..35edc92 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,25 +1,23 @@ ---- 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 -@@ -43,7 +43,8 @@ if( HAVE_FORTRAN ) +--- eccodes-2.14.1-Source.unchanged/fortran/CMakeLists.txt 2019-10-10 13:33:52.000000000 +0200 ++++ eccodes-2.14.1-Source/fortran/CMakeLists.txt 2019-10-27 11:25:48.269661718 +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 GENERATED grib_f90.f90 eccodes_f90.f90 - LIBS eccodes ) + LIBS eccodes + SOVERSION ${ECCODES_SOVERSION_F90}) - 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 - ${grib_api_srcs} ++ + 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.14.1-Source.unchanged/src/CMakeLists.txt 2019-10-10 13:33:52.000000000 +0200 ++++ eccodes-2.14.1-Source/src/CMakeLists.txt 2019-10-27 11:27:56.115531419 +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} -- TEMPLATES ${grib_api_extra_srcs}) -- -+ TEMPLATES ${grib_api_extra_srcs} -+ SOVERSION ${ECCODES_SOVERSION}) - - install( FILES grib_api.h eccodes.h eccodes_windef.h DESTINATION ${INSTALL_INCLUDE_DIR} ) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/eccodes_version.h DESTINATION ${INSTALL_INCLUDE_DIR} ) + TEMPLATES ${grib_api_extra_srcs} ++ SOVERSION ${ECCODES_SOVERSION} + INSTALL_HEADERS_LIST + grib_api.h + eccodes.h diff --git a/eccodes.spec b/eccodes.spec index adf3704..a139740 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.9.2 +Version: 2.14.1 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -8,15 +8,22 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20181010 -# latest rawhide grib_api version is 1.27.0-2 +# latest rawhide grib_api version is 1.27.0-5 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. -# latest upstream grib_api release is 1.27.0 (09-Sep-2018) -%global final_grib_api_version 1.27.0-2 +# latest upstream grib_api release is 1.28.0 (05-Dec-2018) +# see https://confluence.ecmwf.int/display/GRIB/Home +%global final_grib_api_version 1.28.1-1%{?dist} + +%ifarch i686 ppc64 s390x armv7hl + %global obsolete_grib_api 0 +%else + %global obsolete_grib_api 1 +%endif # license remarks: -# most of eccodes is licensed ASL 2.0 but a special case must be noted. -# these 2 files: +# Most of eccodes is licensed ASL 2.0 but a special case must be noted. +# These 2 files: # src/grib_yacc.c # src/grib_yacc.h # contain a special exception clause that allows them to be @@ -37,11 +44,6 @@ Patch1: eccodes-32bit.patch # Add soversion to the shared libraries, since upstream refuses to do so # https://software.ecmwf.int/issues/browse/SUP-1809 Patch2: eccodes-soversion.patch -# remove rpath from cmake/pkg-config.pc.in -Patch3: eccodes-rpath.patch -# fix compile flags in fortran checks -# this is needed due to rpath removal -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 @@ -55,16 +57,14 @@ BuildRequires: jasper-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: netcdf-devel -BuildRequires: numpy BuildRequires: openjpeg2-devel -# BuildRequires: python2-devel # For tests BuildRequires: perl(Getopt::Long) BuildRequires: perl(Test::More) # the data is needed by the library and all tools provided in the main package -# the other way arpund, the data package could be installed without +# the other way around, the data package could be installed without # installing the base package. It will probably be pretty useless, # unless a user wishes to read and study all these grib and bufr # file format definitions. @@ -85,7 +85,11 @@ Requires: %{name}-data = %{version}-%{release} # "Please note that GRIB-API support is being discontinued at the end of 2018." # So the old grib_api will need to be obsoleted. +%if 0%{obsolete_grib_api} +# as stated in the note above, setting provides seems not correct here +# Provides: grib_api = %%{final_grib_api_version} Obsoletes: grib_api < %{final_grib_api_version} +%endif # as explained in bugzilla #1562066 ExcludeArch: i686 @@ -113,8 +117,7 @@ in the following formats: * WMO GTS abbreviated header (only decoding). A useful set of command line tools provide quick access to the messages. C, -Fortran 90 and Python (1) interfaces provide access to the main ecCodes -functionality. +and Fortran 90 interfaces provide access to the main ecCodes functionality. ecCodes is an evolution of GRIB-API. It is designed to provide the user with a simple set of functions to access data from several formats with a key/value @@ -122,7 +125,7 @@ approach. For GRIB encoding and decoding, the GRIB-API functionality is provided fully in ecCodes with only minor interface and behaviour changes. Interfaces for C, -Fortran 90 and Python (1) are all maintained as in GRIB-API. However, the +and Fortran 90 are all maintained as in GRIB-API. However, the GRIB-API Fortran 77 interface is no longer available. In addition, a new set of functions with the prefix "codes_" is provided to @@ -137,12 +140,6 @@ 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. - ##################################################### %package devel Summary: Contains ecCodes development files @@ -150,28 +147,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gcc-gfortran%{?_isa} Requires: jasper-devel%{?_isa} +%if 0%{obsolete_grib_api} +# Provides: grib_api-devel = %%{final_grib_api_version} Obsoletes: grib_api-devel < %{final_grib_api_version} +%endif %description devel Header files and libraries for ecCodes. -##################################################### -#%%package -n python2-%%{name} -#Summary: A python2 interface to ecCodes -#Requires: %%{name}%%{?_isa} = %%{version}-%%{release} -#Requires: gcc-gfortran%%{?_isa} -#Requires: jasper-devel%%{?_isa} -# -## a sub package python2-grib_api did not exist -## so no obsoletes needed here -# -#%%description -n python2-%%{name} -#A python2 interface to ecCodes. Also a legacy interface to gribapi is provided. - -##################################################### -# note: python3 is not yet supported by eccodes -# but upstream intents to make it available before the end of 2018 - ##################################################### %package data Summary: Data needed by the eccodes library and tools @@ -194,13 +177,7 @@ BuildArch: noarch %description doc 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. +in C, and Fortran 90. ##################################################### %prep @@ -236,25 +213,38 @@ cd build # * ECCODES_OMP_THREADS , enable OMP threads # * EXTRA_TESTS , enable extended regression testing # +#-- The following features are set to AUTO by default and +# explicitely switched on to ensure they don't vanish unnoticed +# in case of dependency problems during the build: +# * ENABLE_JPG +# ^ ENABLE_FORTRAN +# * ENABLE_NETCDF +# NetCDF is only needed to create the grib_to_netcdf convert tool +# +# * ENABLE_PYTHON has value AUTO as default, so if python2 is available +# during a package build it will build an interface for it. +# To make sure it does not do so, explicitely switch it off. +# Python3 support has been moved to an additional project now, +# so python handling has been removed completely from this spec file. +# #-- Also add an explicit option to not use rpath # # Note: -DINSTALL_LIB_DIR=%%{_lib} is needed because otherwise # the library so files get installed in /usr/lib in stead # of /usr/lib64 on x86_64. -# Note: -DPYTHON_EXECUTABLE was added to prevent deprecation warnings -# during running of tests which breaks -# Test #184: eccodes_p_grib_keys_iterator_test %cmake3 -DINSTALL_LIB_DIR=%{_lib} \ -DENABLE_ECCODES_OMP_THREADS=ON \ -DENABLE_EXTRA_TESTS=ON \ + -DENABLE_JPG=ON \ -DENABLE_PNG=ON \ - -DCMAKE_SKIP_RPATH=TRUE \ + -DENABLE_FORTRAN=ON \ + -DENABLE_NETCDF=ON \ + -DCMAKE_SKIP_INSTALL_RPATH=TRUE \ -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ -DENABLE_PYTHON=OFF \ .. -# -DPYTHON_EXECUTABLE=%%{_bindir}/python2 \ %make_build @@ -292,19 +282,26 @@ mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/C cp examples/C/*.c %{buildroot}%{_datadir}/doc/%{name}/examples/C mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/F90 cp examples/F90/*.f90 %{buildroot}%{_datadir}/doc/%{name}/examples/F90 -#mkdir -p %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python -#cp examples/python/*.py %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python -#cp examples/python/*.c %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python -#cp examples/python/*.csv %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python -# adapt a shebang to make it point explicitely to python2 -#sed -i -e 's/\/bin\/env python/\/usr\/bin\/python2/' \ -# %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python/high_level_api.py +# also not needed for x86_64 +# maybe they fixed it for all archs? +#%%ifarch i686 armv7hl +# # pass (nothing to do) +#%%else +# # it seems pkgconfig files end up in lib in stead of lib64 now +# # so move them to the right place +# mv %%{buildroot}/%%{_usr}/lib/pkgconfig/ \ +# %%{buildroot}/%%{_libdir}/pkgconfig/ +#%%endif -# move cmake files to the cmake folder below libdir -# as suggested in the review request -mkdir -p %{buildroot}%{_libdir}/cmake/%{name}/ -mv %{buildroot}%{_datadir}/%{name}/cmake/* %{buildroot}%{_libdir}/cmake/%{name}/ +# It seems the cmake options +# -DCMAKE_SKIP_RPATH=TRUE +# -DCMAKE_SKIP_INSTALL_RPATH=TRUE +# have no effect on the generated *.pc files. +# These still contain an rpath reference, so patch them and remove +# the rpath using sed +sed -i 's|^libs=.*$|libs=-L${libdir} -leccodes|g' %{buildroot}/%{_libdir}/pkgconfig/eccodes.pc +sed -i 's|^libs=.*$|libs=-L${libdir} -leccodes_f90 -leccodes|g' %{buildroot}/%{_libdir}/pkgconfig/eccodes_f90.pc %ldconfig_scriptlets @@ -319,29 +316,17 @@ cd build # 'eccodes_t_bufr_dump_(de|en)code_C' tests run. # These tests compile on the fly generated C code, and # without this setting the loader does not find the libraries. -# -# These fail due to build flag issues, i.e. the test script does a -# test build of some on the fly generated fortran code, but cannot -# find the necessary *.mod fortran module definition files. -# There is no easy way to define this as environment setting, -# so a patch has been added to solve this for now. -# See: https://software.ecmwf.int/issues/browse/SUP-1812 -# (unfortunately this issue is not public) + LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ LIBRARY_PATH=%{buildroot}/%{_libdir} \ ctest3 -V %{?_smp_mflags} %files %license LICENSE -%doc README ChangeLog AUTHORS +%doc README.md ChangeLog AUTHORS NEWS NOTICE %{_bindir}/* %{_libdir}/*.so.* -#%%files -n python2-%%{name} -#%%{python2_sitearch}/%%{name} -#%%{python2_sitearch}/%%{name}-*-py*.egg-info -#%%{python2_sitearch}/gribapi - %files devel %{_includedir}/* %{_fmoddir}/%{name}.mod @@ -362,6 +347,8 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Oct 27 2019 Jos de Kloe - 2.14.1-1 +- Upgrade to upstream version 2.14.1 * Sat Nov 24 2018 Jos de Kloe - 2.9.2-1 - Upgrade to upstream version 2.9.2 From 82b0b3cbf1580f76b182a1671ec31ade45de0c9c Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 27 Oct 2019 15:48:06 +0100 Subject: [PATCH 09/90] first epel8 version --- .gitignore | 1 + eccodes-32bit.patch | 8 ++--- eccodes-soversion.patch | 32 ++++++++--------- eccodes.spec | 77 ++++++++++++----------------------------- 4 files changed, 42 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index d516662..1b658ad 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /eccodes-2.12.0-Source.tar.gz /eccodes-2.12.5-Source.tar.gz /eccodes-2.13.0-Source.tar.gz +/eccodes-2.14.1-Source.tar.gz diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch index 6161926..3f116e7 100644 --- a/eccodes-32bit.patch +++ b/eccodes-32bit.patch @@ -1,5 +1,5 @@ ---- eccodes-2.13.0-Source.orig/src/grib_api_prototypes.h 2019-07-08 14:06:45.000000000 +0200 -+++ eccodes-2.13.0-Source/src/grib_api_prototypes.h 2019-07-25 12:58:22.124808129 +0200 +--- eccodes-2.14.1-Source.unchanged/src/grib_api_prototypes.h 2019-10-10 13:33:52.000000000 +0200 ++++ eccodes-2.14.1-Source/src/grib_api_prototypes.h 2019-10-27 11:20:05.496702520 +0100 @@ -872,8 +872,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); @@ -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.13.0-Source.orig/src/grib_ieeefloat.c 2019-07-08 14:06:45.000000000 +0200 -+++ eccodes-2.13.0-Source/src/grib_ieeefloat.c 2019-07-25 12:58:22.125808103 +0200 +--- eccodes-2.14.1-Source.unchanged/src/grib_ieeefloat.c 2019-10-10 13:33:52.000000000 +0200 ++++ eccodes-2.14.1-Source/src/grib_ieeefloat.c 2019-10-27 11:20:05.497702497 +0100 @@ -392,14 +392,14 @@ unsigned long grib_ieee_to_long(double x * grib_encode_unsigned_long. */ diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 5db7e7b..35edc92 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,25 +1,23 @@ ---- eccodes-2.13.0-Source.orig/fortran/CMakeLists.txt 2019-07-08 14:06:44.000000000 +0200 -+++ eccodes-2.13.0-Source/fortran/CMakeLists.txt 2019-07-25 12:58:27.343673693 +0200 -@@ -43,7 +43,8 @@ if( HAVE_FORTRAN ) +--- eccodes-2.14.1-Source.unchanged/fortran/CMakeLists.txt 2019-10-10 13:33:52.000000000 +0200 ++++ eccodes-2.14.1-Source/fortran/CMakeLists.txt 2019-10-27 11:25:48.269661718 +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 GENERATED grib_f90.f90 eccodes_f90.f90 - LIBS eccodes ) + LIBS eccodes + SOVERSION ${ECCODES_SOVERSION_F90}) - 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.13.0-Source.orig/src/CMakeLists.txt 2019-07-08 14:06:45.000000000 +0200 -+++ eccodes-2.13.0-Source/src/CMakeLists.txt 2019-07-25 12:58:27.343673693 +0200 -@@ -437,8 +437,8 @@ ecbuild_add_library(TARGET eccodes - ${grib_api_srcs} ++ + 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.14.1-Source.unchanged/src/CMakeLists.txt 2019-10-10 13:33:52.000000000 +0200 ++++ eccodes-2.14.1-Source/src/CMakeLists.txt 2019-10-27 11:27:56.115531419 +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} -- TEMPLATES ${grib_api_extra_srcs}) -- -+ TEMPLATES ${grib_api_extra_srcs} -+ SOVERSION ${ECCODES_SOVERSION}) - - install( FILES grib_api.h eccodes.h eccodes_windef.h DESTINATION ${INSTALL_INCLUDE_DIR} ) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/eccodes_version.h DESTINATION ${INSTALL_INCLUDE_DIR} ) + TEMPLATES ${grib_api_extra_srcs} ++ SOVERSION ${ECCODES_SOVERSION} + INSTALL_HEADERS_LIST + grib_api.h + eccodes.h diff --git a/eccodes.spec b/eccodes.spec index a6832dd..7af4ec0 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.13.0 -Release: 2%{?dist} +Version: 2.14.1 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -8,7 +8,7 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20181010 -# latest rawhide grib_api version is 1.27.0-4 +# latest rawhide grib_api version is 1.27.0-5 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) @@ -86,7 +86,8 @@ Requires: %{name}-data = %{version}-%{release} # So the old grib_api will need to be obsoleted. %if 0%{obsolete_grib_api} -Provides: grib_api = %{final_grib_api_version} +# as stated in the note above, setting provides seems not correct here +# Provides: grib_api = %%{final_grib_api_version} Obsoletes: grib_api < %{final_grib_api_version} %endif @@ -94,8 +95,8 @@ Obsoletes: grib_api < %{final_grib_api_version} 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 +# but the exclude is still needed for EPEL-7 and EPEL-8 +ExcludeArch: ppc64 # as explained in bugzilla #1562076 ExcludeArch: s390x # as explained in bugzilla #1562084 @@ -147,7 +148,7 @@ Requires: gcc-gfortran%{?_isa} Requires: jasper-devel%{?_isa} %if 0%{obsolete_grib_api} -Provides: grib_api-devel = %{final_grib_api_version} +# Provides: grib_api-devel = %%{final_grib_api_version} Obsoletes: grib_api-devel < %{final_grib_api_version} %endif @@ -244,10 +245,6 @@ cd build -DECCODES_SOVERSION_F90=%{so_version_f90} \ -DENABLE_PYTHON=OFF \ .. -# note: -# with -DCMAKE_SKIP_RPATH=TRUE -# LD_LIBRARY_PATH and #LIBRARY_PATH need to be defined before running ctest. -# with -DCMAKE_SKIP_INSTALL_RPATH=TRUE this seems not needed %make_build @@ -286,14 +283,16 @@ cp examples/C/*.c %{buildroot}%{_datadir}/doc/%{name}/examples/C mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/F90 cp examples/F90/*.f90 %{buildroot}%{_datadir}/doc/%{name}/examples/F90 -%ifarch i686 armv7hl - # pass (nothing to do) -%else - # it seems pkgconfig files end up in lib in stead of lib64 now - # so move them to the right place - mv %{buildroot}/%{_usr}/lib/pkgconfig/ \ - %{buildroot}/%{_libdir}/pkgconfig/ -%endif +# also not needed for x86_64 +# maybe they fixed it for all archs? +#%%ifarch i686 armv7hl +# # pass (nothing to do) +#%%else +# # it seems pkgconfig files end up in lib in stead of lib64 now +# # so move them to the right place +# mv %%{buildroot}/%%{_usr}/lib/pkgconfig/ \ +# %%{buildroot}/%%{_libdir}/pkgconfig/ +#%%endif # It seems the cmake options # -DCMAKE_SKIP_RPATH=TRUE @@ -317,18 +316,9 @@ cd build # 'eccodes_t_bufr_dump_(de|en)code_C' tests run. # These tests compile on the fly generated C code, and # without this setting the loader does not find the libraries. -# -# These fail due to build flag issues, i.e. the test script does a -# test build of some on the fly generated fortran code, but cannot -# find the necessary *.mod fortran module definition files. -# There is no easy way to define this as environment setting, -# so a patch has been added to solve this for now. -# See: https://software.ecmwf.int/issues/browse/SUP-1812 -# (unfortunately this issue is not public) - -#LD_LIBRARY_PATH=%%{buildroot}/%%{_libdir} \ -#LIBRARY_PATH=%%{buildroot}/%%{_libdir} \ +LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ +LIBRARY_PATH=%{buildroot}/%{_libdir} \ ctest3 -V %{?_smp_mflags} %files @@ -357,31 +347,8 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog -* Sat Aug 10 2019 Jos de Kloe - 2.13.0-2 -- apply bugfix to pc files contribuited by Emanuele Di Giacomo - -* Thu Jul 25 2019 Jos de Kloe - 2.13.0-1 -- Upgrade to upstream version 2.13.0 - -* Wed Jul 24 2019 Fedora Release Engineering - 2.12.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 09 2019 Jos de Kloe - 2.12.5-1 -- Upgrade to upstream version 2.12.5 - -* Mon Mar 18 2019 Orion Poplawski - 2.12.0-3 -- Rebuild for netcdf 4.6.3 - -* Thu Feb 21 2019 Jos de Kloe - 2.12.0-2 -- bump final_grib_api_version global variable to 1.27.1, so just above the - actual final version, to prevent the obsoletes to be disabled if the release - gets bumped. See BZ #1677968 - -* 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 +* Sun Oct 27 2019 Jos de Kloe - 2.14.1-1 +- Upgrade to upstream version 2.14.1 * Sat Nov 24 2018 Jos de Kloe - 2.9.2-1 - Upgrade to upstream version 2.9.2 From e282745de3acaaa452c81c220cde69adb3a12af3 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 27 Oct 2019 15:50:05 +0100 Subject: [PATCH 10/90] update sources list --- .gitignore | 6 ------ sources | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 17470ea..1b658ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,5 @@ -/eccodes-2.7.0-Source.tar.gz /eccodes_test_data.tar.gz -/eccodes-2.7.3-Source.tar.gz -/eccodes-2.8.0-Source.tar.gz -/eccodes-2.8.2-Source.tar.gz -/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 /eccodes-2.12.5-Source.tar.gz /eccodes-2.13.0-Source.tar.gz diff --git a/sources b/sources index 7b2c40f..f646642 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ -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 +SHA512 (eccodes-2.12.5-Source.tar.gz) = ab1267dffdb3d0dbcdd65f23db2d77bc7bd8f3241083374c75bc62ebf70b7d29d8af9f657d6da05a47e363151c8d995adfadca7bbf95ebb24a27303d80f081a4 +SHA512 (eccodes-2.13.0-Source.tar.gz) = bbde1b7092caad20772b21cd06040938f99e763f77a6622820e3cc2fba5c0765178822be4b3c33b41a927757da85f311c0c4f057500ca58d257dde304e7eeca3 +SHA512 (eccodes-2.14.1-Source.tar.gz) = 864b530642884baa0c3c56eee646a61af7d659e711c7ed4d08a5cc2d68812ecb96b8efabf40c4c9d5dcb3a0edeb1caddffea2ec3438571d3e90dc9cca1dabebe From 9d279afcaef9443fa03d95f8a869ca5b786b529f Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 27 Oct 2019 15:52:56 +0100 Subject: [PATCH 11/90] updated sources list --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 0f7be28..f646642 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (eccodes_test_data_20181010.tar.gz) = 24c24ec9e01d230cf542abe5c131f05b8e6 SHA512 (eccodes-2.12.0-Source.tar.gz) = 3dc876bde2a6c81a43bcc64ecb12969f28eae3cfbc8fed7da7797fc722dc8b446ac7be5178f55b7d395653e0718437b842296a7d4d11b372b8692404c76aa4ad SHA512 (eccodes-2.12.5-Source.tar.gz) = ab1267dffdb3d0dbcdd65f23db2d77bc7bd8f3241083374c75bc62ebf70b7d29d8af9f657d6da05a47e363151c8d995adfadca7bbf95ebb24a27303d80f081a4 SHA512 (eccodes-2.13.0-Source.tar.gz) = bbde1b7092caad20772b21cd06040938f99e763f77a6622820e3cc2fba5c0765178822be4b3c33b41a927757da85f311c0c4f057500ca58d257dde304e7eeca3 +SHA512 (eccodes-2.14.1-Source.tar.gz) = 864b530642884baa0c3c56eee646a61af7d659e711c7ed4d08a5cc2d68812ecb96b8efabf40c4c9d5dcb3a0edeb1caddffea2ec3438571d3e90dc9cca1dabebe From a9b3d7b5ad87f3428e422d854a4acacc5eae9df8 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 27 Jun 2020 14:20:30 +0200 Subject: [PATCH 12/90] adapt to epel8 --- eccodes.spec | 62 +++++++++------------------------------------------- 1 file changed, 10 insertions(+), 52 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index a96498e..a959afb 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.18.0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -94,11 +94,20 @@ Obsoletes: grib_api < %{final_grib_api_version} # as explained in bugzilla #1562066 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 and EPEL-8 +ExcludeArch: ppc64 # as explained in bugzilla #1562076 ExcludeArch: s390x # as explained in bugzilla #1562084 ExcludeArch: armv7hl +%if 0%{?rhel} >= 7 +# as explained in bugzilla #1629377 +ExcludeArch: aarch64 +%endif + %description ecCodes is a package developed by ECMWF which provides an application programming interface and a set of tools for decoding and encoding messages @@ -225,14 +234,6 @@ cd build # the library so files get installed in /usr/lib in stead # of /usr/lib64 on x86_64. -# Build with -fallow-argument-mismatch for gcc 10 compatibility -# otherwise the fortran interface fails to compile -# (thanks for the hint Orion) -# Reported upstream at https://jira.ecmwf.int/browse/SUP-3081 -# note that setting FCFLAGS is not sufficient, i.e. this doesn't work: -# export FCFLAGS="%%{build_fflags} -fallow-argument-mismatch" -# defining the -DCMAKE_Fortran_FLAGS for camke is required to let it compile. - %cmake3 -DINSTALL_LIB_DIR=%{_lib} \ -DENABLE_ECCODES_OMP_THREADS=ON \ -DENABLE_EXTRA_TESTS=ON \ @@ -243,7 +244,6 @@ cd build -DCMAKE_SKIP_INSTALL_RPATH=TRUE \ -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ - -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \ -DENABLE_PYTHON=OFF \ .. @@ -348,54 +348,12 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog -* Sat Jun 27 2020 Jos de Kloe - 2.18.0-2 -- Rebuild after fixing mistake in ExcludeArch statements - * Sat Jun 27 2020 Jos de Kloe - 2.18.0-1 - Upgrade to upstream version 2.18.0 -* 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 - -* Tue Jan 28 2020 Fedora Release Engineering - 2.15.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Dec 15 2019 Jos de Kloe - 2.15.0-1 -- Upgrade to upstream version 2.15.0 - * Sun Oct 27 2019 Jos de Kloe - 2.14.1-1 - Upgrade to upstream version 2.14.1 -* Sat Aug 10 2019 Jos de Kloe - 2.13.0-2 -- apply bugfix to pc files contribuited by Emanuele Di Giacomo - -* Thu Jul 25 2019 Jos de Kloe - 2.13.0-1 -- Upgrade to upstream version 2.13.0 - -* Wed Jul 24 2019 Fedora Release Engineering - 2.12.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu May 09 2019 Jos de Kloe - 2.12.5-1 -- Upgrade to upstream version 2.12.5 - -* Mon Mar 18 2019 Orion Poplawski - 2.12.0-3 -- Rebuild for netcdf 4.6.3 - -* Thu Feb 21 2019 Jos de Kloe - 2.12.0-2 -- bump final_grib_api_version global variable to 1.27.1, so just above the - actual final version, to prevent the obsoletes to be disabled if the release - gets bumped. See BZ #1677968 - -* 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 From e37933b64a19c255a987ec8ee60c9e9f0a513efb Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 27 Jun 2020 15:02:09 +0200 Subject: [PATCH 13/90] updated sources file --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index f4f819f..4062163 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (eccodes-2.18.0-Source.tar.gz) = 8daf7f2e1aed055ca6402881f5473e4ae90ba24cc779005f57f99adc7468da459c7539e64f455e2122dd83df29992fd7a6dad2700c8331c4083226e091fbb629 SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e - From 9c6cc6a2d180532c80f84259e393188a4fc3e1f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 16:13:58 +0000 Subject: [PATCH 14/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index a96498e..80c1657 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -348,6 +348,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.18.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jun 27 2020 Jos de Kloe - 2.18.0-2 - Rebuild after fixing mistake in ExcludeArch statements From 7121cf8098295cf6fe7af047fc9eb48f6ef98d31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:43:13 +0000 Subject: [PATCH 15/90] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- eccodes.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 80c1657..8f8fccc 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.18.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -348,6 +348,10 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.18.0-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cf1c4f5ff4728fcbf989ed0523a1e54764724e64 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Wed, 5 Aug 2020 10:26:31 +0200 Subject: [PATCH 16/90] Adapt the spec file to use the new style cmake macros --- eccodes.spec | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index 8f8fccc..dda1272 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.18.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -176,12 +176,12 @@ in C, and Fortran 90. %autosetup -n %{name}-%{version}-Source -p1 # unpack the test data below build -mkdir build -cd build +mkdir -p %{_vpath_builddir} +pushd %{_vpath_builddir} tar xf %SOURCE1 +popd # remove executable permissions from c files -cd .. chmod 644 tigge/*.c chmod 644 tools/*.c @@ -189,7 +189,6 @@ chmod 644 tools/*.c chmod 644 AUTHORS LICENSE %build -cd build #-- The following features are disabled by default and not switched on: # @@ -244,19 +243,20 @@ cd build -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \ - -DENABLE_PYTHON=OFF \ - .. + -DENABLE_PYTHON=OFF -%make_build +# note the final '..' is no longer needed to the cmake3 call. +# this is now hidden in the %%cmake3 macro + +%cmake_build # copy some include files to the build dir -# that are otherwise not found when creating the debugsource subpackage -cd .. -cp fortran/eccodes_constants.h build/fortran/ -cp fortran/grib_api_constants.h build/fortran/ +# that are otherwise not found when creating the debugsource sub-package +cp fortran/eccodes_constants.h %{_vpath_builddir}/fortran/ +cp fortran/grib_api_constants.h %{_vpath_builddir}/fortran/ %install -%make_install -C build +%cmake_install mkdir -p %{buildroot}%{_fmoddir} mv %{buildroot}%{_includedir}/*.mod %{buildroot}%{_fmoddir}/ @@ -307,7 +307,7 @@ sed -i 's|^libs=.*$|libs=-L${libdir} -leccodes_f90 -leccodes|g' %{buildroot}/%{_ %ldconfig_scriptlets %check -cd build +cd %{_vpath_builddir} # notes: # * the LD_LIBRARY_PATH setting is required to let the tests @@ -317,6 +317,8 @@ cd build # 'eccodes_t_bufr_dump_(de|en)code_C' tests run. # These tests compile on the fly generated C code, and # without this setting the loader does not find the libraries. +# * this is a 'non-standard' use of ctest3 so it does currently not +# work with the %%ctest macro. LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ LIBRARY_PATH=%{buildroot}/%{_libdir} \ @@ -348,6 +350,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Aug 05 2020 Jos de Kloe - 2.18.0-5 +- Adapt the spec file to use the new style cmake macros + * Sat Aug 01 2020 Fedora Release Engineering - 2.18.0-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dc5f405a24e8eaf6d072f73d9841ef40cb17f2c6 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 17:06:37 +0000 Subject: [PATCH 17/90] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 4ef87b99836d3428bf3d4a108ab464f67e660d81 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Fri, 16 Oct 2020 18:23:12 +0200 Subject: [PATCH 18/90] Upgrade to upstream version 2.19.0 and remove patch 1; also remove ExcludeArch switches --- .gitignore | 1 + eccodes-32bit.patch | 19 ++++++++++--------- eccodes-soversion.patch | 31 +++++++++++++++---------------- eccodes.spec | 20 ++++++++++---------- sources | 1 + 5 files changed, 37 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index fab925f..5a45cb1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /eccodes-2.17.0-Source.tar.gz /eccodes-2.18.0-Source.tar.gz /eccodes_test_data_20200626.tar.gz +/eccodes-2.19.0-Source.tar.gz diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch index f019811..8bf6d79 100644 --- a/eccodes-32bit.patch +++ b/eccodes-32bit.patch @@ -1,6 +1,6 @@ ---- eccodes-2.18.0-Source.unchanged/src/grib_api_prototypes.h 2020-06-24 11:11:27.000000000 +0200 -+++ eccodes-2.18.0-Source/src/grib_api_prototypes.h 2020-06-27 09:23:17.543758993 +0200 -@@ -860,8 +860,8 @@ double grib_ieeefloat_error(double x); +--- eccodes-2.19.0-Source.unchanged/src/grib_api_prototypes.h 2020-10-15 13:21:34.000000000 +0200 ++++ eccodes-2.19.0-Source/src/grib_api_prototypes.h 2020-10-16 08:52:25.171175169 +0200 +@@ -859,8 +859,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,17 +11,18 @@ 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.18.0-Source.unchanged/src/grib_ieeefloat.c 2020-06-24 11:11:27.000000000 +0200 -+++ eccodes-2.18.0-Source/src/grib_ieeefloat.c 2020-06-27 09:23:17.545758944 +0200 -@@ -443,14 +443,14 @@ unsigned long grib_ieee_to_long(double x +--- eccodes-2.19.0-Source.unchanged/src/grib_ieeefloat.c 2020-10-15 13:21:34.000000000 +0200 ++++ eccodes-2.19.0-Source/src/grib_ieeefloat.c 2020-10-16 09:01:37.712934707 +0200 +@@ -442,7 +442,7 @@ unsigned long grib_ieee_to_long(double x + * Byte swapping is actually implemented in grib_decode_unsigned_long and * grib_encode_unsigned_long. */ - -unsigned long grib_ieee64_to_long(double x) +uint64_t grib_ieee64_to_long(double x) { unsigned long lval; - memcpy(&lval, &x, 8); + DebugAssert(sizeof(double) == sizeof(long)); +@@ -450,7 +450,7 @@ unsigned long grib_ieee64_to_long(double return lval; } @@ -29,4 +30,4 @@ +double grib_long_to_ieee64(uint64_t x) { double dval; - memcpy(&dval, &x, 8); + DebugAssert(sizeof(double) == sizeof(long)); diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index defa647..cad10e0 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,21 +1,20 @@ ---- eccodes-2.18.0-Source.unchanged/fortran/CMakeLists.txt 2020-06-24 11:11:27.000000000 +0200 -+++ eccodes-2.18.0-Source/fortran/CMakeLists.txt 2020-06-27 09:23:33.020376062 +0200 -@@ -45,7 +45,9 @@ if( HAVE_FORTRAN ) - ecbuild_add_library( TARGET eccodes_f90 - SOURCES grib_fortran.c grib_f90.f90 eccodes_f90.f90 grib_kinds.h - GENERATED grib_f90.f90 eccodes_f90.f90 -- LIBS eccodes ) -+ LIBS eccodes -+ SOVERSION ${ECCODES_SOVERSION_F90}) -+ +--- eccodes-2.19.0-Source.unchanged/fortran/CMakeLists.txt 2020-10-15 13:21:34.000000000 +0200 ++++ eccodes-2.19.0-Source/fortran/CMakeLists.txt 2020-10-16 09:07:21.570272038 +0200 +@@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) + GENERATED grib_f90.f90 eccodes_f90.f90 + PUBLIC_INCLUDES $ + $ +- PRIVATE_LIBS eccodes ) ++ PRIVATE_LIBS eccodes ++ SOVERSION ${ECCODES_SOVERSION_F90}) + 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.18.0-Source.unchanged/src/CMakeLists.txt 2020-06-24 11:11:27.000000000 +0200 -+++ eccodes-2.18.0-Source/src/CMakeLists.txt 2020-06-27 09:27:13.845630950 +0200 -@@ -442,6 +442,7 @@ ecbuild_add_library( TARGET eccodes - GENERATED grib_api_version.c - LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES} +--- eccodes-2.19.0-Source.unchanged/src/CMakeLists.txt 2020-10-15 13:21:34.000000000 +0200 ++++ eccodes-2.19.0-Source/src/CMakeLists.txt 2020-10-16 08:52:43.447698207 +0200 +@@ -445,6 +445,7 @@ ecbuild_add_library( TARGET eccodes + PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} + PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${grib_api_extra_srcs} + SOVERSION ${ECCODES_SOVERSION} INSTALL_HEADERS_LIST diff --git a/eccodes.spec b/eccodes.spec index dda1272..c53654a 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.18.0 -Release: 5%{?dist} +Version: 2.19.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -37,13 +37,10 @@ Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/ec # now and then so rename the datapack using the download date # to make it versioned in fedora Source1: http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz#/eccodes_test_data_%{datapack_date}.tar.gz -# Support 32-bit -# https://software.ecmwf.int/issues/browse/SUP-1813 -# (unfortunately this issue is not public) -Patch1: eccodes-32bit.patch + # Add soversion to the shared libraries, since upstream refuses to do so # https://software.ecmwf.int/issues/browse/SUP-1809 -Patch2: eccodes-soversion.patch +Patch1: eccodes-soversion.patch # note that the requests to make the other issues public are filed here: # https://software.ecmwf.int/issues/browse/SUP-2073 @@ -93,11 +90,11 @@ Obsoletes: grib_api < %{final_grib_api_version} %endif # as explained in bugzilla #1562066 -ExcludeArch: i686 +#ExcludeArch: i686 # as explained in bugzilla #1562076 -ExcludeArch: s390x +#ExcludeArch: s390x # as explained in bugzilla #1562084 -ExcludeArch: armv7hl +#ExcludeArch: armv7hl %description ecCodes is a package developed by ECMWF which provides an application @@ -350,6 +347,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Fri Oct 16 2020 Jos de Kloe - 2.19.0-1 +- Upgrade to upstream version 2.19.0 and remove patch 1 + * Wed Aug 05 2020 Jos de Kloe - 2.18.0-5 - Adapt the spec file to use the new style cmake macros diff --git a/sources b/sources index e19b3ab..6a0df4e 100644 --- a/sources +++ b/sources @@ -8,3 +8,4 @@ SHA512 (eccodes-2.16.0-Source.tar.gz) = 6e8768824152d8782c1457cfe79daed32114d1b4 SHA512 (eccodes-2.17.0-Source.tar.gz) = 362c6ae23c23326a3a969c6ba109bdf96ba449cba899030a69efb03e53870f6c90e3f6dbf9d0d2f94febf3a661e607390e8b16d58e64066c4fa941af554ebee7 SHA512 (eccodes-2.18.0-Source.tar.gz) = 8daf7f2e1aed055ca6402881f5473e4ae90ba24cc779005f57f99adc7468da459c7539e64f455e2122dd83df29992fd7a6dad2700c8331c4083226e091fbb629 SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e +SHA512 (eccodes-2.19.0-Source.tar.gz) = d2e63b4c478444f9f06c7322e5b61f54641c997262043864308ede07de1808ec2ee2a63c2ed8afb4e4339cf0cf93949778174b6aa3ce0859878d63fc4b9dbf83 From d7452732f002faa1ff9dc709c66f3e06805d6528 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 17 Oct 2020 11:37:19 +0200 Subject: [PATCH 19/90] disable i686 and s390x again (still fail test suite). Also add -fPIC which seems required to get the library compiled on armv7hl. --- eccodes.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index c53654a..4ea1fed 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -90,9 +90,9 @@ Obsoletes: grib_api < %{final_grib_api_version} %endif # as explained in bugzilla #1562066 -#ExcludeArch: i686 +ExcludeArch: i686 # as explained in bugzilla #1562076 -#ExcludeArch: s390x +ExcludeArch: s390x # as explained in bugzilla #1562084 #ExcludeArch: armv7hl @@ -229,6 +229,11 @@ chmod 644 AUTHORS LICENSE # export FCFLAGS="%%{build_fflags} -fallow-argument-mismatch" # defining the -DCMAKE_Fortran_FLAGS for camke is required to let it compile. +# added -DCMAKE_Fortran_FLAGS="-fPIC" +# because the koji build crashes with the error that it needs this setting +# when I try to build for armv7hl (other archs do not complain ......) +# I have no idea what causes this difference in behaviour. + %cmake3 -DINSTALL_LIB_DIR=%{_lib} \ -DENABLE_ECCODES_OMP_THREADS=ON \ -DENABLE_EXTRA_TESTS=ON \ @@ -240,6 +245,7 @@ chmod 644 AUTHORS LICENSE -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \ + -DCMAKE_Fortran_FLAGS="-fPIC" \ -DENABLE_PYTHON=OFF # note the final '..' is no longer needed to the cmake3 call. From ab3d8aface7b6140a61ba29845a0ef27ffda8848 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 17 Oct 2020 12:06:58 +0200 Subject: [PATCH 20/90] activate ExcludeArch: armv7hl again (still test failures) and add a note on the grib_api webpage at ECMWF that is no longer available. --- eccodes.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index 4ea1fed..f6abf99 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -8,11 +8,12 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20200626 -# latest fedora-32 grib_api version is 1.27.0-7 +# latest fedora-33 grib_api version is 1.27.0-8 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) -# see https://confluence.ecmwf.int/display/GRIB/Home +# is was written on https://confluence.ecmwf.int/display/GRIB/Home +# (Note that this page is no longer available, 17-Oct-2020) %global final_grib_api_version 1.28.1-1%{?dist} %ifarch i686 ppc64 s390x armv7hl @@ -94,7 +95,7 @@ ExcludeArch: i686 # as explained in bugzilla #1562076 ExcludeArch: s390x # as explained in bugzilla #1562084 -#ExcludeArch: armv7hl +ExcludeArch: armv7hl %description ecCodes is a package developed by ECMWF which provides an application @@ -353,8 +354,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog -* Fri Oct 16 2020 Jos de Kloe - 2.19.0-1 +* Sat Oct 17 2020 Jos de Kloe - 2.19.0-1 - Upgrade to upstream version 2.19.0 and remove patch 1 +- Add -fpic to the fortran flags (needed for compiling on armv7hl) * Wed Aug 05 2020 Jos de Kloe - 2.18.0-5 - Adapt the spec file to use the new style cmake macros From 8b7d65f555e592196f1b3774ea09aebb6114baaa Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 18 Oct 2020 20:04:43 +0200 Subject: [PATCH 21/90] add patch to fix test run for eccodes 2.19.0 --- python-eccodes-bufrtests.patch | 20 +++++++ python-eccodes.spec | 97 ++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 python-eccodes-bufrtests.patch create mode 100644 python-eccodes.spec diff --git a/python-eccodes-bufrtests.patch b/python-eccodes-bufrtests.patch new file mode 100644 index 0000000..6f90a67 --- /dev/null +++ b/python-eccodes-bufrtests.patch @@ -0,0 +1,20 @@ +--- eccodes-0.9.9.unchanged/tests/test_eccodes.py 2020-08-03 15:12:30.000000000 +0200 ++++ eccodes-0.9.9/tests/test_eccodes.py 2020-10-18 19:52:10.369784597 +0200 +@@ -537,7 +537,7 @@ def test_bufr_keys_iterator(): + keyname = codes_bufr_keys_iterator_get_name(iterid) + assert "#" not in keyname + count += 1 +- assert count == 53 ++ assert count == 54 + + codes_set(bid, "unpack", 1) + codes_bufr_keys_iterator_rewind(iterid) +@@ -545,7 +545,7 @@ def test_bufr_keys_iterator(): + while codes_bufr_keys_iterator_next(iterid): + keyname = codes_bufr_keys_iterator_get_name(iterid) + count += 1 +- assert count == 156 ++ assert count == 157 + codes_bufr_keys_iterator_rewind(iterid) + codes_bufr_keys_iterator_delete(iterid) + codes_release(bid) diff --git a/python-eccodes.spec b/python-eccodes.spec new file mode 100644 index 0000000..3bb6382 --- /dev/null +++ b/python-eccodes.spec @@ -0,0 +1,97 @@ +Name: python-eccodes +Version: 0.9.9 +Release: 1%{?dist} +Summary: Python interface to the ecCodes GRIB and BUFR decoder/encoder +License: ASL 2.0 +# note: upstream has changed the name on pypi from eccodes-python to eccodes +URL: https://pypi.org/project/eccodes/ +Source0: https://files.pythonhosted.org/packages/source/e/eccodes/eccodes-%{version}.tar.gz +# see https://github.com/ecmwf/eccodes-python/pull/21 +Patch1: python-eccodes-setup.patch +# see https://github.com/ecmwf/eccodes-python/issues/36 +Patch2: python-eccodes-sphinx-config.patch +# see https://github.com/ecmwf/eccodes-python/issues/37 +# this patch is needed for eccodes2.19.0 (not for eccodes 2.18.0) +Patch3: python-eccodes-bufrtests.patch + +# note that the fast bindings are arch dependent +BuildRequires: eccodes-devel +BuildRequires: python3-devel +BuildRequires: python3-setuptools +# needed to build the fast bindings +BuildRequires: python3-cffi +# needed for checks/tests +BuildRequires: python3-pytest +BuildRequires: python3-numpy +# these next 2 seem not actually used, although they are mentioned as +# test dependencies in the setup.py file: +#BuildRequires: python3-pytest-cov +#BuildRequires: python3-pytest-flakes + +# needed to build the documentation +BuildRequires: python3-sphinx + +# dont try to build for architectures for which the main +# ecccodes library cannot yet be build + +# as explained in bugzilla #1562066 +ExcludeArch: i686 +# as explained in bugzilla #1562076 +ExcludeArch: s390x +# as explained in bugzilla #1562084 +ExcludeArch: armv7hl + + +%global _description \ +Python 3 interface to encode and decode GRIB and BUFR files via the \ +ECMWF ecCodes library. It allows reading and writing of GRIB 1 and 2 \ +files and BUFR 3 and 4 files. + +%description %_description + +%package -n python3-eccodes +Summary: %summary + +%{?python_provide:%python_provide python3-eccodes} + +%description -n python3-eccodes %_description + +%prep +%autosetup -n eccodes-%{version} -p1 + +%build +%py3_build +# buld documentation +%{__python3} setup.py build_sphinx +# remove generated sphinx files that are not part of the actual documentation +rm build/sphinx/html/.buildinfo + +%install +%py3_install + +# remove *.h files that do not belong in a python module directory +rm %{buildroot}%{python3_sitearch}/gribapi/*.h + +%check +%{__python3} -m eccodes selfcheck +%{__python3} -m pytest -v + +%files -n python3-eccodes +%doc README.rst +%doc build/sphinx/html/ +%license LICENSE +%{python3_sitearch}/eccodes-*-py*.egg-info +%{python3_sitearch}/eccodes +%{python3_sitearch}/gribapi + + +%changelog +* Sun Oct 18 2020 Jos de Kloe 0.9.9-1 +- new upstream version, and adapt to upstream project name change +- add patch for sphinx configuration problem +- add patch to fix test run for eccodes 2.19.0 +* Sat Jul 04 2020 Jos de Kloe 0.9.8-1 +- new upstream version +* Thu Mar 19 2020 Jos de Kloe 0.9.7-1 +- First version for Fedora, based on a spec file contributed by + Emanuele Di Giacomo and Daniele Branchini. From 31b4a19ff74524c79b505f2f20437e84eb2dd044 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 18 Oct 2020 20:13:18 +0200 Subject: [PATCH 22/90] remove 2 files that I added by mistake (that's what you get if upstream decides to rename the python module to have exactly the same name as the c library itself). --- python-eccodes-bufrtests.patch | 20 ------- python-eccodes.spec | 97 ---------------------------------- 2 files changed, 117 deletions(-) delete mode 100644 python-eccodes-bufrtests.patch delete mode 100644 python-eccodes.spec diff --git a/python-eccodes-bufrtests.patch b/python-eccodes-bufrtests.patch deleted file mode 100644 index 6f90a67..0000000 --- a/python-eccodes-bufrtests.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- eccodes-0.9.9.unchanged/tests/test_eccodes.py 2020-08-03 15:12:30.000000000 +0200 -+++ eccodes-0.9.9/tests/test_eccodes.py 2020-10-18 19:52:10.369784597 +0200 -@@ -537,7 +537,7 @@ def test_bufr_keys_iterator(): - keyname = codes_bufr_keys_iterator_get_name(iterid) - assert "#" not in keyname - count += 1 -- assert count == 53 -+ assert count == 54 - - codes_set(bid, "unpack", 1) - codes_bufr_keys_iterator_rewind(iterid) -@@ -545,7 +545,7 @@ def test_bufr_keys_iterator(): - while codes_bufr_keys_iterator_next(iterid): - keyname = codes_bufr_keys_iterator_get_name(iterid) - count += 1 -- assert count == 156 -+ assert count == 157 - codes_bufr_keys_iterator_rewind(iterid) - codes_bufr_keys_iterator_delete(iterid) - codes_release(bid) diff --git a/python-eccodes.spec b/python-eccodes.spec deleted file mode 100644 index 3bb6382..0000000 --- a/python-eccodes.spec +++ /dev/null @@ -1,97 +0,0 @@ -Name: python-eccodes -Version: 0.9.9 -Release: 1%{?dist} -Summary: Python interface to the ecCodes GRIB and BUFR decoder/encoder -License: ASL 2.0 -# note: upstream has changed the name on pypi from eccodes-python to eccodes -URL: https://pypi.org/project/eccodes/ -Source0: https://files.pythonhosted.org/packages/source/e/eccodes/eccodes-%{version}.tar.gz -# see https://github.com/ecmwf/eccodes-python/pull/21 -Patch1: python-eccodes-setup.patch -# see https://github.com/ecmwf/eccodes-python/issues/36 -Patch2: python-eccodes-sphinx-config.patch -# see https://github.com/ecmwf/eccodes-python/issues/37 -# this patch is needed for eccodes2.19.0 (not for eccodes 2.18.0) -Patch3: python-eccodes-bufrtests.patch - -# note that the fast bindings are arch dependent -BuildRequires: eccodes-devel -BuildRequires: python3-devel -BuildRequires: python3-setuptools -# needed to build the fast bindings -BuildRequires: python3-cffi -# needed for checks/tests -BuildRequires: python3-pytest -BuildRequires: python3-numpy -# these next 2 seem not actually used, although they are mentioned as -# test dependencies in the setup.py file: -#BuildRequires: python3-pytest-cov -#BuildRequires: python3-pytest-flakes - -# needed to build the documentation -BuildRequires: python3-sphinx - -# dont try to build for architectures for which the main -# ecccodes library cannot yet be build - -# as explained in bugzilla #1562066 -ExcludeArch: i686 -# as explained in bugzilla #1562076 -ExcludeArch: s390x -# as explained in bugzilla #1562084 -ExcludeArch: armv7hl - - -%global _description \ -Python 3 interface to encode and decode GRIB and BUFR files via the \ -ECMWF ecCodes library. It allows reading and writing of GRIB 1 and 2 \ -files and BUFR 3 and 4 files. - -%description %_description - -%package -n python3-eccodes -Summary: %summary - -%{?python_provide:%python_provide python3-eccodes} - -%description -n python3-eccodes %_description - -%prep -%autosetup -n eccodes-%{version} -p1 - -%build -%py3_build -# buld documentation -%{__python3} setup.py build_sphinx -# remove generated sphinx files that are not part of the actual documentation -rm build/sphinx/html/.buildinfo - -%install -%py3_install - -# remove *.h files that do not belong in a python module directory -rm %{buildroot}%{python3_sitearch}/gribapi/*.h - -%check -%{__python3} -m eccodes selfcheck -%{__python3} -m pytest -v - -%files -n python3-eccodes -%doc README.rst -%doc build/sphinx/html/ -%license LICENSE -%{python3_sitearch}/eccodes-*-py*.egg-info -%{python3_sitearch}/eccodes -%{python3_sitearch}/gribapi - - -%changelog -* Sun Oct 18 2020 Jos de Kloe 0.9.9-1 -- new upstream version, and adapt to upstream project name change -- add patch for sphinx configuration problem -- add patch to fix test run for eccodes 2.19.0 -* Sat Jul 04 2020 Jos de Kloe 0.9.8-1 -- new upstream version -* Thu Mar 19 2020 Jos de Kloe 0.9.7-1 -- First version for Fedora, based on a spec file contributed by - Emanuele Di Giacomo and Daniele Branchini. From 486346bf6ee0d47e14baa2b66569af9eb9e313f9 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Fri, 13 Nov 2020 17:12:29 +0100 Subject: [PATCH 23/90] Upgrade to upstream version 2.19.1 --- .gitignore | 1 + eccodes.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5a45cb1..441be1d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /eccodes-2.18.0-Source.tar.gz /eccodes_test_data_20200626.tar.gz /eccodes-2.19.0-Source.tar.gz +/eccodes-2.19.1-Source.tar.gz diff --git a/eccodes.spec b/eccodes.spec index f6abf99..4edd02c 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.19.0 +Version: 2.19.1 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -354,6 +354,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Fri Nov 13 2020 Jos de Kloe - 2.19.1-1 +- Upgrade to upstream version 2.19.1 + * Sat Oct 17 2020 Jos de Kloe - 2.19.0-1 - Upgrade to upstream version 2.19.0 and remove patch 1 - Add -fpic to the fortran flags (needed for compiling on armv7hl) diff --git a/sources b/sources index 6a0df4e..1f3e7fa 100644 --- a/sources +++ b/sources @@ -9,3 +9,4 @@ SHA512 (eccodes-2.17.0-Source.tar.gz) = 362c6ae23c23326a3a969c6ba109bdf96ba449cb SHA512 (eccodes-2.18.0-Source.tar.gz) = 8daf7f2e1aed055ca6402881f5473e4ae90ba24cc779005f57f99adc7468da459c7539e64f455e2122dd83df29992fd7a6dad2700c8331c4083226e091fbb629 SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e SHA512 (eccodes-2.19.0-Source.tar.gz) = d2e63b4c478444f9f06c7322e5b61f54641c997262043864308ede07de1808ec2ee2a63c2ed8afb4e4339cf0cf93949778174b6aa3ce0859878d63fc4b9dbf83 +SHA512 (eccodes-2.19.1-Source.tar.gz) = 9e11eb1759a9a340bd5f9fd83585f599f633f5896bebac963d46c50abf99fea7017c9dddbfc7b73799684871255bdf424786d3205df0ab477d22073c81b4f984 From a7454734af6188edea24ae4a92887aa6e7ce4021 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 23 Jan 2021 19:40:01 +0100 Subject: [PATCH 24/90] Upgrade to upstream version 2.20.0 --- .gitignore | 1 + eccodes-soversion.patch | 8 ++++---- eccodes.spec | 5 ++++- sources | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 441be1d..293c67f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /eccodes_test_data_20200626.tar.gz /eccodes-2.19.0-Source.tar.gz /eccodes-2.19.1-Source.tar.gz +/eccodes-2.20.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index cad10e0..99fb837 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.19.0-Source.unchanged/fortran/CMakeLists.txt 2020-10-15 13:21:34.000000000 +0200 -+++ eccodes-2.19.0-Source/fortran/CMakeLists.txt 2020-10-16 09:07:21.570272038 +0200 +--- eccodes-2.20.0-Source.unchanged/fortran/CMakeLists.txt 2021-01-20 13:18:04.000000000 +0100 ++++ eccodes-2.20.0-Source/fortran/CMakeLists.txt 2021-01-23 17:35:32.042141813 +0100 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,8 +10,8 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.19.0-Source.unchanged/src/CMakeLists.txt 2020-10-15 13:21:34.000000000 +0200 -+++ eccodes-2.19.0-Source/src/CMakeLists.txt 2020-10-16 08:52:43.447698207 +0200 +--- eccodes-2.20.0-Source.unchanged/src/CMakeLists.txt 2021-01-20 13:18:04.000000000 +0100 ++++ eccodes-2.20.0-Source/src/CMakeLists.txt 2021-01-23 17:35:32.043141787 +0100 @@ -445,6 +445,7 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} diff --git a/eccodes.spec b/eccodes.spec index 4edd02c..7d7f51c 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.19.1 +Version: 2.20.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -354,6 +354,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sat Jan 23 2021 Jos de Kloe - 2.20.0-1 +- Upgrade to upstream version 2.20.0 + * Fri Nov 13 2020 Jos de Kloe - 2.19.1-1 - Upgrade to upstream version 2.19.1 diff --git a/sources b/sources index 1f3e7fa..316ee13 100644 --- a/sources +++ b/sources @@ -10,3 +10,4 @@ SHA512 (eccodes-2.18.0-Source.tar.gz) = 8daf7f2e1aed055ca6402881f5473e4ae90ba24c SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e SHA512 (eccodes-2.19.0-Source.tar.gz) = d2e63b4c478444f9f06c7322e5b61f54641c997262043864308ede07de1808ec2ee2a63c2ed8afb4e4339cf0cf93949778174b6aa3ce0859878d63fc4b9dbf83 SHA512 (eccodes-2.19.1-Source.tar.gz) = 9e11eb1759a9a340bd5f9fd83585f599f633f5896bebac963d46c50abf99fea7017c9dddbfc7b73799684871255bdf424786d3205df0ab477d22073c81b4f984 +SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d1caf60614ececfe2fabe07d7c794baf120f5df82716f37b2540f7f6a6cd82f04070a78bf65dc7d499ca50dc0 From 02475f35d3dcae981b53f961db7b63df8353b5d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 04:14:43 +0000 Subject: [PATCH 25/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 7d7f51c..7371478 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -354,6 +354,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.20.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Jan 23 2021 Jos de Kloe - 2.20.0-1 - Upgrade to upstream version 2.20.0 From cd4e74ca8714f69437d80cd36234758f83ff219f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 30 Jan 2021 09:41:44 -0700 Subject: [PATCH 26/90] Cleanup sources --- sources | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sources b/sources index 316ee13..e78dd41 100644 --- a/sources +++ b/sources @@ -1,13 +1,2 @@ -SHA512 (eccodes_test_data_20181010.tar.gz) = 24c24ec9e01d230cf542abe5c131f05b8e627dd9d170c666628bb5fd8f7b1a6aa11a35456b8d742c59f54c6aabac78658efd68b0c50779d466aba3d35b4a0231 -SHA512 (eccodes-2.12.0-Source.tar.gz) = 3dc876bde2a6c81a43bcc64ecb12969f28eae3cfbc8fed7da7797fc722dc8b446ac7be5178f55b7d395653e0718437b842296a7d4d11b372b8692404c76aa4ad -SHA512 (eccodes-2.12.5-Source.tar.gz) = ab1267dffdb3d0dbcdd65f23db2d77bc7bd8f3241083374c75bc62ebf70b7d29d8af9f657d6da05a47e363151c8d995adfadca7bbf95ebb24a27303d80f081a4 -SHA512 (eccodes-2.13.0-Source.tar.gz) = bbde1b7092caad20772b21cd06040938f99e763f77a6622820e3cc2fba5c0765178822be4b3c33b41a927757da85f311c0c4f057500ca58d257dde304e7eeca3 -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 -SHA512 (eccodes-2.18.0-Source.tar.gz) = 8daf7f2e1aed055ca6402881f5473e4ae90ba24cc779005f57f99adc7468da459c7539e64f455e2122dd83df29992fd7a6dad2700c8331c4083226e091fbb629 SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e -SHA512 (eccodes-2.19.0-Source.tar.gz) = d2e63b4c478444f9f06c7322e5b61f54641c997262043864308ede07de1808ec2ee2a63c2ed8afb4e4339cf0cf93949778174b6aa3ce0859878d63fc4b9dbf83 -SHA512 (eccodes-2.19.1-Source.tar.gz) = 9e11eb1759a9a340bd5f9fd83585f599f633f5896bebac963d46c50abf99fea7017c9dddbfc7b73799684871255bdf424786d3205df0ab477d22073c81b4f984 SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d1caf60614ececfe2fabe07d7c794baf120f5df82716f37b2540f7f6a6cd82f04070a78bf65dc7d499ca50dc0 From aa231a33bea0a8375a4180e05ddcb1e95512d8e2 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 28 Mar 2021 13:06:32 +0200 Subject: [PATCH 27/90] new upstream version --- .gitignore | 1 + eccodes-soversion.patch | 8 ++++---- eccodes.spec | 11 ++++++++--- sources | 1 + 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 293c67f..6c2ecc4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /eccodes-2.19.0-Source.tar.gz /eccodes-2.19.1-Source.tar.gz /eccodes-2.20.0-Source.tar.gz +/eccodes-2.21.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 99fb837..b1c351a 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.20.0-Source.unchanged/fortran/CMakeLists.txt 2021-01-20 13:18:04.000000000 +0100 -+++ eccodes-2.20.0-Source/fortran/CMakeLists.txt 2021-01-23 17:35:32.042141813 +0100 +--- eccodes-2.21.0-Source.unchanged/fortran/CMakeLists.txt 2021-03-24 12:58:39.000000000 +0100 ++++ eccodes-2.21.0-Source/fortran/CMakeLists.txt 2021-03-28 11:10:48.975174329 +0200 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,8 +10,8 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.20.0-Source.unchanged/src/CMakeLists.txt 2021-01-20 13:18:04.000000000 +0100 -+++ eccodes-2.20.0-Source/src/CMakeLists.txt 2021-01-23 17:35:32.043141787 +0100 +--- eccodes-2.21.0-Source.unchanged/src/CMakeLists.txt 2021-03-24 12:58:39.000000000 +0100 ++++ eccodes-2.21.0-Source/src/CMakeLists.txt 2021-03-28 11:10:48.977174277 +0200 @@ -445,6 +445,7 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} diff --git a/eccodes.spec b/eccodes.spec index 7371478..20d35e9 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.20.0 -Release: 2%{?dist} +Version: 2.21.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -245,10 +245,12 @@ chmod 644 AUTHORS LICENSE -DCMAKE_SKIP_INSTALL_RPATH=TRUE \ -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ - -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \ -DCMAKE_Fortran_FLAGS="-fPIC" \ -DENABLE_PYTHON=OFF +# not needed anymore (solved in the cmake file now) +# -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" + # note the final '..' is no longer needed to the cmake3 call. # this is now hidden in the %%cmake3 macro @@ -354,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Mar 28 2021 Jos de Kloe - 2.21.0-1 +- Upgrade to upstream version 2.21.0 + * Tue Jan 26 2021 Fedora Release Engineering - 2.20.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index e78dd41..c14dedb 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d1caf60614ececfe2fabe07d7c794baf120f5df82716f37b2540f7f6a6cd82f04070a78bf65dc7d499ca50dc0 +SHA512 (eccodes-2.21.0-Source.tar.gz) = f2ba8361b99800646a92f5f5beb7ec2facf2ee3b8a3f7985d9681a23b2faae778004c8c688ebe4b3a8492e99c76422c66ecc8943d12d3342d5bc1d38362ccf06 From c3595f3ffdf4228969291c68d3cb6b988ce24441 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 28 Mar 2021 13:08:19 +0200 Subject: [PATCH 28/90] disable excludearch statements to check what the current status is. --- eccodes.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index 20d35e9..2ac74e1 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -8,7 +8,7 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20200626 -# latest fedora-33 grib_api version is 1.27.0-8 +# latest fedora-33 grib_api version is 1.27.0-9 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) @@ -91,11 +91,11 @@ Obsoletes: grib_api < %{final_grib_api_version} %endif # as explained in bugzilla #1562066 -ExcludeArch: i686 +#ExcludeArch: i686 # as explained in bugzilla #1562076 -ExcludeArch: s390x +#ExcludeArch: s390x # as explained in bugzilla #1562084 -ExcludeArch: armv7hl +#ExcludeArch: armv7hl %description ecCodes is a package developed by ECMWF which provides an application From 7d6f5332bceb2645e0ee96076efb7119f4e38a14 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 28 Mar 2021 13:23:32 +0200 Subject: [PATCH 29/90] the 3 problematic arches are still failing. Activcate excludearch switches again. --- eccodes.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index 2ac74e1..e592ed4 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -91,11 +91,11 @@ Obsoletes: grib_api < %{final_grib_api_version} %endif # as explained in bugzilla #1562066 -#ExcludeArch: i686 +ExcludeArch: i686 # as explained in bugzilla #1562076 -#ExcludeArch: s390x +ExcludeArch: s390x # as explained in bugzilla #1562084 -#ExcludeArch: armv7hl +ExcludeArch: armv7hl %description ecCodes is a package developed by ECMWF which provides an application From f5111bde08e672a9ccda215d7e1fa4450aa5147b Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Mon, 24 May 2021 21:18:12 +0200 Subject: [PATCH 30/90] Upgrade to upstream version 2.22.0 --- .gitignore | 1 + eccodes-soversion.patch | 8 ++++---- eccodes.spec | 7 +++++-- sources | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 6c2ecc4..9fd5415 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /eccodes-2.19.1-Source.tar.gz /eccodes-2.20.0-Source.tar.gz /eccodes-2.21.0-Source.tar.gz +/eccodes-2.22.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index b1c351a..fe30901 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.21.0-Source.unchanged/fortran/CMakeLists.txt 2021-03-24 12:58:39.000000000 +0100 -+++ eccodes-2.21.0-Source/fortran/CMakeLists.txt 2021-03-28 11:10:48.975174329 +0200 +--- eccodes-2.22.0-Source.unchanged/fortran/CMakeLists.txt 2021-05-19 10:53:28.000000000 +0200 ++++ eccodes-2.22.0-Source/fortran/CMakeLists.txt 2021-05-24 20:28:37.002735089 +0200 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,8 +10,8 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.21.0-Source.unchanged/src/CMakeLists.txt 2021-03-24 12:58:39.000000000 +0100 -+++ eccodes-2.21.0-Source/src/CMakeLists.txt 2021-03-28 11:10:48.977174277 +0200 +--- eccodes-2.22.0-Source.unchanged/src/CMakeLists.txt 2021-05-19 10:53:29.000000000 +0200 ++++ eccodes-2.22.0-Source/src/CMakeLists.txt 2021-05-24 20:28:37.025734539 +0200 @@ -445,6 +445,7 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} diff --git a/eccodes.spec b/eccodes.spec index e592ed4..43e02f7 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.21.0 +Version: 2.22.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -8,7 +8,7 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20200626 -# latest fedora-33 grib_api version is 1.27.0-9 +# latest fedora-34 grib_api version is 1.27.0-9 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) @@ -356,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Mon May 24 2021 Jos de Kloe - 2.22.0-1 +- Upgrade to upstream version 2.22.0 + * Sun Mar 28 2021 Jos de Kloe - 2.21.0-1 - Upgrade to upstream version 2.21.0 diff --git a/sources b/sources index c14dedb..122126d 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d1caf60614ececfe2fabe07d7c794baf120f5df82716f37b2540f7f6a6cd82f04070a78bf65dc7d499ca50dc0 SHA512 (eccodes-2.21.0-Source.tar.gz) = f2ba8361b99800646a92f5f5beb7ec2facf2ee3b8a3f7985d9681a23b2faae778004c8c688ebe4b3a8492e99c76422c66ecc8943d12d3342d5bc1d38362ccf06 +SHA512 (eccodes-2.22.0-Source.tar.gz) = 488ff560cd9969c2d5c0dd0ce3e6b4433954893758ae1a2bd9177536d8b08a89f37aac4f6a175c271f528d5c838fd4ec7b090dfb1f691df5cfceb67508bdc470 From 292438487e7a0f5c7932c189547db60eb42d4d68 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 19 Jun 2021 16:46:09 +0200 Subject: [PATCH 31/90] Upgrade to upstream version 2.22.1 --- .gitignore | 1 + eccodes.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9fd5415..149e42e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /eccodes-2.20.0-Source.tar.gz /eccodes-2.21.0-Source.tar.gz /eccodes-2.22.0-Source.tar.gz +/eccodes-2.22.1-Source.tar.gz diff --git a/eccodes.spec b/eccodes.spec index 43e02f7..bc03686 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.22.0 +Version: 2.22.1 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -12,7 +12,7 @@ Summary: WMO data format decoding and encoding # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) -# is was written on https://confluence.ecmwf.int/display/GRIB/Home +# as was written on https://confluence.ecmwf.int/display/GRIB/Home # (Note that this page is no longer available, 17-Oct-2020) %global final_grib_api_version 1.28.1-1%{?dist} @@ -356,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sat Jun 19 2021 Jos de Kloe - 2.22.1-1 +- Upgrade to upstream version 2.22.1 + * Mon May 24 2021 Jos de Kloe - 2.22.0-1 - Upgrade to upstream version 2.22.0 diff --git a/sources b/sources index 122126d..8b4b979 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d1caf60614ececfe2fabe07d7c794baf120f5df82716f37b2540f7f6a6cd82f04070a78bf65dc7d499ca50dc0 SHA512 (eccodes-2.21.0-Source.tar.gz) = f2ba8361b99800646a92f5f5beb7ec2facf2ee3b8a3f7985d9681a23b2faae778004c8c688ebe4b3a8492e99c76422c66ecc8943d12d3342d5bc1d38362ccf06 SHA512 (eccodes-2.22.0-Source.tar.gz) = 488ff560cd9969c2d5c0dd0ce3e6b4433954893758ae1a2bd9177536d8b08a89f37aac4f6a175c271f528d5c838fd4ec7b090dfb1f691df5cfceb67508bdc470 +SHA512 (eccodes-2.22.1-Source.tar.gz) = 86818604eca75a34c8ce0cf0540d255c0db2d92bf03970a65c972fb2a16b6c472f6dcebfd04bdac4b76b8db2fcf2ed4dfa8a70875eaf1353a775fc185e5de9a0 From 3092298b9047d3ef2977b6df3650b8c98d6e0169 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 21:36:20 +0000 Subject: [PATCH 32/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index bc03686..ce0b112 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.22.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -356,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 2.22.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jun 19 2021 Jos de Kloe - 2.22.1-1 - Upgrade to upstream version 2.22.1 From b817b9e0c57ce82066cfd62dde2c5bd24dc50b1e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 9 Aug 2021 20:23:11 -0600 Subject: [PATCH 33/90] Rebuild for netcdf 4.8.0 --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index ce0b112..273c4f2 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.22.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -356,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Tue Aug 10 2021 Orion Poplawski - 2.22.1-3 +- Rebuild for netcdf 4.8.0 + * Wed Jul 21 2021 Fedora Release Engineering - 2.22.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 0c8a1e15e5b9f330d6f51c97f9e366b31fc9e0d6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 10 Aug 2021 18:29:29 -0600 Subject: [PATCH 34/90] Rebuild for netcdf 4.8.0 --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 273c4f2..3d1ccb9 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.22.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -356,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Aug 11 2021 Orion Poplawski - 2.22.1-4 +- Rebuild for netcdf 4.8.0 + * Tue Aug 10 2021 Orion Poplawski - 2.22.1-3 - Rebuild for netcdf 4.8.0 From 65f97a669b6305ce2471288a466d708d2d1acde4 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 2 Sep 2021 11:37:22 +0200 Subject: [PATCH 35/90] update to version 2.23.0 --- .gitignore | 1 + eccodes-soversion.patch | 14 +++++++------- eccodes-test-grib_to_netcdf.patch | 15 +++++++++++++++ eccodes.spec | 29 +++++++++++++---------------- sources | 1 + 5 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 eccodes-test-grib_to_netcdf.patch diff --git a/.gitignore b/.gitignore index 149e42e..2e004eb 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /eccodes-2.21.0-Source.tar.gz /eccodes-2.22.0-Source.tar.gz /eccodes-2.22.1-Source.tar.gz +/eccodes-2.23.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index fe30901..78e9b89 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,18 +1,18 @@ ---- eccodes-2.22.0-Source.unchanged/fortran/CMakeLists.txt 2021-05-19 10:53:28.000000000 +0200 -+++ eccodes-2.22.0-Source/fortran/CMakeLists.txt 2021-05-24 20:28:37.002735089 +0200 +--- eccodes-2.23.0-Source.unchanged/fortran/CMakeLists.txt 2021-08-25 11:35:41.000000000 +0200 ++++ eccodes-2.23.0-Source/fortran/CMakeLists.txt 2021-09-01 08:40:58.089840900 +0200 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ $ -- PRIVATE_LIBS eccodes ) -+ PRIVATE_LIBS eccodes +- PRIVATE_LIBS eccodes ${ECCODES_PTHREADS_LIBRARIES} ) ++ PRIVATE_LIBS eccodes ${ECCODES_PTHREADS_LIBRARIES} + SOVERSION ${ECCODES_SOVERSION_F90}) if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.22.0-Source.unchanged/src/CMakeLists.txt 2021-05-19 10:53:29.000000000 +0200 -+++ eccodes-2.22.0-Source/src/CMakeLists.txt 2021-05-24 20:28:37.025734539 +0200 -@@ -445,6 +445,7 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.23.0-Source.unchanged/src/CMakeLists.txt 2021-08-25 11:35:41.000000000 +0200 ++++ eccodes-2.23.0-Source/src/CMakeLists.txt 2021-09-01 08:31:13.559364510 +0200 +@@ -444,6 +444,7 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${grib_api_extra_srcs} diff --git a/eccodes-test-grib_to_netcdf.patch b/eccodes-test-grib_to_netcdf.patch new file mode 100644 index 0000000..eff2a26 --- /dev/null +++ b/eccodes-test-grib_to_netcdf.patch @@ -0,0 +1,15 @@ +--- eccodes-2.23.0-Source.unchanged/tests/grib_to_netcdf.sh 2021-08-25 11:35:41.000000000 +0200 ++++ eccodes-2.23.0-Source/tests/grib_to_netcdf.sh 2021-09-02 10:31:33.417295119 +0200 +@@ -64,8 +64,10 @@ if [ $ECCODES_ON_WINDOWS -eq 0 ]; then + set -e + if [ $stat -eq 0 ]; then + have_netcdf4=1 +- res=`${tools_dir}/grib_get -TA -p identifier,versionNumberOfSuperblock $tempNetcdf` +- [ "$res" = "HDF5 0" ] ++# res=`${tools_dir}/grib_get -TA -p identifier,versionNumberOfSuperblock $tempNetcdf` ++# [ "$res" = "HDF5 0" ] ++ res=`${tools_dir}/grib_get -TA -p identifier $tempNetcdf` ++ [ "$res" = "HDF5" ] + fi + fi + diff --git a/eccodes.spec b/eccodes.spec index 3d1ccb9..fc2e458 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.22.1 -Release: 4%{?dist} +Version: 2.23.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -8,7 +8,7 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20200626 -# latest fedora-34 grib_api version is 1.27.0-9 +# latest fedora-35 grib_api version is 1.27.0-12 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) @@ -43,6 +43,11 @@ Source1: http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.ta # https://software.ecmwf.int/issues/browse/SUP-1809 Patch1: eccodes-soversion.patch +# Disable versionNumberOfSuperblock checking, since the test expects 0 but +# on Fedora rawhide the code returns a value of 2. +# Issue reported upstream as: https://jira.ecmwf.int/browse/SUP-3497 +Patch2: eccodes-test-grib_to_netcdf.patch + # note that the requests to make the other issues public are filed here: # https://software.ecmwf.int/issues/browse/SUP-2073 # (and again, unfortunately this issue is not public) @@ -222,14 +227,6 @@ chmod 644 AUTHORS LICENSE # the library so files get installed in /usr/lib in stead # of /usr/lib64 on x86_64. -# Build with -fallow-argument-mismatch for gcc 10 compatibility -# otherwise the fortran interface fails to compile -# (thanks for the hint Orion) -# Reported upstream at https://jira.ecmwf.int/browse/SUP-3081 -# note that setting FCFLAGS is not sufficient, i.e. this doesn't work: -# export FCFLAGS="%%{build_fflags} -fallow-argument-mismatch" -# defining the -DCMAKE_Fortran_FLAGS for camke is required to let it compile. - # added -DCMAKE_Fortran_FLAGS="-fPIC" # because the koji build crashes with the error that it needs this setting # when I try to build for armv7hl (other archs do not complain ......) @@ -246,10 +243,7 @@ chmod 644 AUTHORS LICENSE -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ -DCMAKE_Fortran_FLAGS="-fPIC" \ - -DENABLE_PYTHON=OFF - -# not needed anymore (solved in the cmake file now) -# -DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" + -DENABLE_PYTHON2=OFF # note the final '..' is no longer needed to the cmake3 call. # this is now hidden in the %%cmake3 macro @@ -356,6 +350,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu Sep 02 2021 Jos de Kloe - 2.23.0-1 +- Upgrade to upstream version 2.23.0 + * Wed Aug 11 2021 Orion Poplawski - 2.22.1-4 - Rebuild for netcdf 4.8.0 @@ -488,7 +485,7 @@ ctest3 -V %{?_smp_mflags} - Implement so version because upstream refuses to do so - Add fix for test failure 184 and ldconfig_scriptlets and move unversioned so file to devel package - as suggested by Robert-André Mauchin + as suggested by Robert-André Mauchin - Add a documentation and a data sub-package - Change the license and add a note explaining why this was done diff --git a/sources b/sources index 8b4b979..0317ff5 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d SHA512 (eccodes-2.21.0-Source.tar.gz) = f2ba8361b99800646a92f5f5beb7ec2facf2ee3b8a3f7985d9681a23b2faae778004c8c688ebe4b3a8492e99c76422c66ecc8943d12d3342d5bc1d38362ccf06 SHA512 (eccodes-2.22.0-Source.tar.gz) = 488ff560cd9969c2d5c0dd0ce3e6b4433954893758ae1a2bd9177536d8b08a89f37aac4f6a175c271f528d5c838fd4ec7b090dfb1f691df5cfceb67508bdc470 SHA512 (eccodes-2.22.1-Source.tar.gz) = 86818604eca75a34c8ce0cf0540d255c0db2d92bf03970a65c972fb2a16b6c472f6dcebfd04bdac4b76b8db2fcf2ed4dfa8a70875eaf1353a775fc185e5de9a0 +SHA512 (eccodes-2.23.0-Source.tar.gz) = df8e9f25396d91ae0adb1b1502cdb6c1473d80caf79ce3fe9318ecc63194fd1c7dc7424fccf44aabf8c06ea343d59093bb21e75f6e5466f21ce44cb514e07350 From a0b1b4222ec3bd595f8d64d08bbaa1db1f856d31 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 2 Sep 2021 11:51:59 +0200 Subject: [PATCH 36/90] remove non-utf8 character from change log --- eccodes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index fc2e458..d0395fa 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -485,7 +485,7 @@ ctest3 -V %{?_smp_mflags} - Implement so version because upstream refuses to do so - Add fix for test failure 184 and ldconfig_scriptlets and move unversioned so file to devel package - as suggested by Robert-André Mauchin + as suggested by Robert-Andre Mauchin - Add a documentation and a data sub-package - Change the license and add a note explaining why this was done From 8f1bff3cafdd4db89ef11820185e21dffc0254b6 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Mon, 11 Oct 2021 20:38:37 +0200 Subject: [PATCH 37/90] update to version 2.23.0 for epel8 --- .gitignore | 2 +- eccodes-32bit.patch | 32 -------------------------------- eccodes-soversion.patch | 31 +++++++++++++++---------------- eccodes.spec | 29 +++++++++++++++++++---------- sources | 2 +- 5 files changed, 36 insertions(+), 60 deletions(-) delete mode 100644 eccodes-32bit.patch diff --git a/.gitignore b/.gitignore index 29f4bf6..cb5cc65 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/eccodes-2.18.0-Source.tar.gz /eccodes_test_data_20200626.tar.gz +/eccodes-2.23.0-Source.tar.gz diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch deleted file mode 100644 index f019811..0000000 --- a/eccodes-32bit.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- eccodes-2.18.0-Source.unchanged/src/grib_api_prototypes.h 2020-06-24 11:11:27.000000000 +0200 -+++ eccodes-2.18.0-Source/src/grib_api_prototypes.h 2020-06-27 09:23:17.543758993 +0200 -@@ -860,8 +860,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); --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.18.0-Source.unchanged/src/grib_ieeefloat.c 2020-06-24 11:11:27.000000000 +0200 -+++ eccodes-2.18.0-Source/src/grib_ieeefloat.c 2020-06-27 09:23:17.545758944 +0200 -@@ -443,14 +443,14 @@ unsigned long grib_ieee_to_long(double x - * grib_encode_unsigned_long. - */ - --unsigned long grib_ieee64_to_long(double x) -+uint64_t grib_ieee64_to_long(double x) - { - unsigned long lval; - memcpy(&lval, &x, 8); - return lval; - } - --double grib_long_to_ieee64(unsigned long x) -+double grib_long_to_ieee64(uint64_t x) - { - double dval; - memcpy(&dval, &x, 8); diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index defa647..78e9b89 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,21 +1,20 @@ ---- eccodes-2.18.0-Source.unchanged/fortran/CMakeLists.txt 2020-06-24 11:11:27.000000000 +0200 -+++ eccodes-2.18.0-Source/fortran/CMakeLists.txt 2020-06-27 09:23:33.020376062 +0200 -@@ -45,7 +45,9 @@ if( HAVE_FORTRAN ) - ecbuild_add_library( TARGET eccodes_f90 - SOURCES grib_fortran.c grib_f90.f90 eccodes_f90.f90 grib_kinds.h - GENERATED grib_f90.f90 eccodes_f90.f90 -- LIBS eccodes ) -+ LIBS eccodes -+ SOVERSION ${ECCODES_SOVERSION_F90}) -+ +--- eccodes-2.23.0-Source.unchanged/fortran/CMakeLists.txt 2021-08-25 11:35:41.000000000 +0200 ++++ eccodes-2.23.0-Source/fortran/CMakeLists.txt 2021-09-01 08:40:58.089840900 +0200 +@@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) + GENERATED grib_f90.f90 eccodes_f90.f90 + PUBLIC_INCLUDES $ + $ +- PRIVATE_LIBS eccodes ${ECCODES_PTHREADS_LIBRARIES} ) ++ PRIVATE_LIBS eccodes ${ECCODES_PTHREADS_LIBRARIES} ++ SOVERSION ${ECCODES_SOVERSION_F90}) + 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.18.0-Source.unchanged/src/CMakeLists.txt 2020-06-24 11:11:27.000000000 +0200 -+++ eccodes-2.18.0-Source/src/CMakeLists.txt 2020-06-27 09:27:13.845630950 +0200 -@@ -442,6 +442,7 @@ ecbuild_add_library( TARGET eccodes - GENERATED grib_api_version.c - LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${CMATH_LIBRARIES} +--- eccodes-2.23.0-Source.unchanged/src/CMakeLists.txt 2021-08-25 11:35:41.000000000 +0200 ++++ eccodes-2.23.0-Source/src/CMakeLists.txt 2021-09-01 08:31:13.559364510 +0200 +@@ -444,6 +444,7 @@ ecbuild_add_library( TARGET eccodes + PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} + PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${grib_api_extra_srcs} + SOVERSION ${ECCODES_SOVERSION} INSTALL_HEADERS_LIST diff --git a/eccodes.spec b/eccodes.spec index a959afb..dce4f59 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.18.0 +Version: 2.23.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -8,11 +8,12 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20200626 -# latest fedora-32 grib_api version is 1.27.0-7 +# latest fedora-35 grib_api version is 1.27.0-12 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) -# see https://confluence.ecmwf.int/display/GRIB/Home +# as was written on https://confluence.ecmwf.int/display/GRIB/Home +# (Note that this page is no longer available, 17-Oct-2020) %global final_grib_api_version 1.28.1-1%{?dist} %ifarch i686 ppc64 s390x armv7hl @@ -37,13 +38,15 @@ Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/ec # now and then so rename the datapack using the download date # to make it versioned in fedora Source1: http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz#/eccodes_test_data_%{datapack_date}.tar.gz -# Support 32-bit -# https://software.ecmwf.int/issues/browse/SUP-1813 -# (unfortunately this issue is not public) -Patch1: eccodes-32bit.patch + # Add soversion to the shared libraries, since upstream refuses to do so # https://software.ecmwf.int/issues/browse/SUP-1809 -Patch2: eccodes-soversion.patch +Patch1: eccodes-soversion.patch + +# Disable versionNumberOfSuperblock checking, since the test expects 0 but +# on Fedora rawhide the code returns a value of 2. +# Issue reported upstream as: https://jira.ecmwf.int/browse/SUP-3497 +Patch2: eccodes-test-grib_to_netcdf.patch # note that the requests to make the other issues public are filed here: # https://software.ecmwf.int/issues/browse/SUP-2073 @@ -244,7 +247,8 @@ cd build -DCMAKE_SKIP_INSTALL_RPATH=TRUE \ -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ - -DENABLE_PYTHON=OFF \ + -DCMAKE_Fortran_FLAGS="-fPIC" \ + -DENABLE_PYTHON2=OFF \ .. %make_build @@ -317,6 +321,8 @@ cd build # 'eccodes_t_bufr_dump_(de|en)code_C' tests run. # These tests compile on the fly generated C code, and # without this setting the loader does not find the libraries. +# * this is a 'non-standard' use of ctest3 so it does currently not +# work with the %%ctest macro. LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ LIBRARY_PATH=%{buildroot}/%{_libdir} \ @@ -348,6 +354,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Mon Oct 11 2021 Jos de Kloe - 2.23.0-1 +- Upgrade to upstream version 2.23.0 + * Sat Jun 27 2020 Jos de Kloe - 2.18.0-1 - Upgrade to upstream version 2.18.0 @@ -397,7 +406,7 @@ ctest3 -V %{?_smp_mflags} - Implement so version because upstream refuses to do so - Add fix for test failure 184 and ldconfig_scriptlets and move unversioned so file to devel package - as suggested by Robert-André Mauchin + as suggested by Robert-Andre Mauchin - Add a documentation and a data sub-package - Change the license and add a note explaining why this was done diff --git a/sources b/sources index 4062163..30a5938 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (eccodes-2.18.0-Source.tar.gz) = 8daf7f2e1aed055ca6402881f5473e4ae90ba24cc779005f57f99adc7468da459c7539e64f455e2122dd83df29992fd7a6dad2700c8331c4083226e091fbb629 SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e +SHA512 (eccodes-2.23.0-Source.tar.gz) = df8e9f25396d91ae0adb1b1502cdb6c1473d80caf79ce3fe9318ecc63194fd1c7dc7424fccf44aabf8c06ea343d59093bb21e75f6e5466f21ce44cb514e07350 From b12b53ab4b8060ff0cb1de8b22217a02087749de Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Mon, 11 Oct 2021 20:50:04 +0200 Subject: [PATCH 38/90] add eccodes-test-grib_to_netcdf.patch --- eccodes-test-grib_to_netcdf.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 eccodes-test-grib_to_netcdf.patch diff --git a/eccodes-test-grib_to_netcdf.patch b/eccodes-test-grib_to_netcdf.patch new file mode 100644 index 0000000..eff2a26 --- /dev/null +++ b/eccodes-test-grib_to_netcdf.patch @@ -0,0 +1,15 @@ +--- eccodes-2.23.0-Source.unchanged/tests/grib_to_netcdf.sh 2021-08-25 11:35:41.000000000 +0200 ++++ eccodes-2.23.0-Source/tests/grib_to_netcdf.sh 2021-09-02 10:31:33.417295119 +0200 +@@ -64,8 +64,10 @@ if [ $ECCODES_ON_WINDOWS -eq 0 ]; then + set -e + if [ $stat -eq 0 ]; then + have_netcdf4=1 +- res=`${tools_dir}/grib_get -TA -p identifier,versionNumberOfSuperblock $tempNetcdf` +- [ "$res" = "HDF5 0" ] ++# res=`${tools_dir}/grib_get -TA -p identifier,versionNumberOfSuperblock $tempNetcdf` ++# [ "$res" = "HDF5 0" ] ++ res=`${tools_dir}/grib_get -TA -p identifier $tempNetcdf` ++ [ "$res" = "HDF5" ] + fi + fi + From aa2a12089c209a83c60a9edc1331af1f899c5c6d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 1 Dec 2021 21:04:23 +0900 Subject: [PATCH 39/90] Patch grib_api_internal.h for big endian test suite issue (upstream bug SUP-2410) --- ...l.h-reverse-definition-of-FAST_BIG_E.patch | 39 +++++++++++++++++++ eccodes.spec | 11 ++++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch diff --git a/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch b/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch new file mode 100644 index 0000000..803c2cf --- /dev/null +++ b/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch @@ -0,0 +1,39 @@ +From 8cc6b5ee3ac27355ae95c4ce0d60d4e70ad9bbd6 Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA +Date: Wed, 1 Dec 2021 20:23:31 +0900 +Subject: [PATCH] grib_api_internal.h: reverse definition of FAST_BIG_ENDIAN + +In grib_api_internal.h, currently on big endian system, FAST_BIG_ENDIAN is defined +if GRIB_MEM_ALIGN is *not* defined. +On the other hand, for example in src/grib_bits.c, when FAST_BIG_ENDIAN is defined +"grib_bits_fast_big_endian.c" is included, otherwise "grib_bits_any_endian.c" is +included. + +As "grib_bits_any_endian.c" is used also in x86_64 system, it is reasonable to think that +the original intention is that "grib_bits_fast_big_endian.c" needs some alignment +condition, and uses such condition for optimization, otherwise "grib_bits_any_endian.c" +should be used, so it is natural to think that the condition on grib_api_internal.h +is opposite. +--- + src/grib_api_internal.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h +index 3b8fae3c..0c8fcf17 100644 +--- a/src/grib_api_internal.h ++++ b/src/grib_api_internal.h +@@ -40,9 +40,9 @@ extern "C" { + + #if IS_BIG_ENDIAN + #if GRIB_MEM_ALIGN +-#define FAST_BIG_ENDIAN 0 +-#else + #define FAST_BIG_ENDIAN 1 ++#else ++#define FAST_BIG_ENDIAN 0 + #endif + #endif + +-- +2.33.1 + diff --git a/eccodes.spec b/eccodes.spec index d0395fa..3ed79f5 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.23.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -52,6 +52,10 @@ Patch2: eccodes-test-grib_to_netcdf.patch # https://software.ecmwf.int/issues/browse/SUP-2073 # (and again, unfortunately this issue is not public) +# grib_api_internal.h: reverse definition of FAST_BIG_ENDIAN +# https://jira.ecmwf.int/browse/SUP-2410 +Patch3: eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch + BuildRequires: cmake3 BuildRequires: gcc BuildRequires: gcc-gfortran @@ -97,8 +101,6 @@ Obsoletes: grib_api < %{final_grib_api_version} # as explained in bugzilla #1562066 ExcludeArch: i686 -# as explained in bugzilla #1562076 -ExcludeArch: s390x # as explained in bugzilla #1562084 ExcludeArch: armv7hl @@ -350,6 +352,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Dec 1 2021 Mamoru TASAKA - 2.23.0-2 +- Patch grib_api_internal.h for big endian test suite issue (upstream bug SUP-2410) + * Thu Sep 02 2021 Jos de Kloe - 2.23.0-1 - Upgrade to upstream version 2.23.0 From 9abde243ee7d5849e3b471e7ab6537e43b5196bc Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 9 Dec 2021 10:42:26 +0100 Subject: [PATCH 40/90] Upgrade to upstream version 2.24.0 --- .gitignore | 1 + ...l.h-reverse-definition-of-FAST_BIG_E.patch | 29 ++----------------- eccodes-soversion.patch | 8 ++--- eccodes.spec | 17 +++++------ sources | 1 + 5 files changed, 16 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 2e004eb..dcaab7e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /eccodes-2.22.0-Source.tar.gz /eccodes-2.22.1-Source.tar.gz /eccodes-2.23.0-Source.tar.gz +/eccodes-2.24.0-Source.tar.gz diff --git a/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch b/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch index 803c2cf..5df7da7 100644 --- a/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch +++ b/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch @@ -1,27 +1,5 @@ -From 8cc6b5ee3ac27355ae95c4ce0d60d4e70ad9bbd6 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA -Date: Wed, 1 Dec 2021 20:23:31 +0900 -Subject: [PATCH] grib_api_internal.h: reverse definition of FAST_BIG_ENDIAN - -In grib_api_internal.h, currently on big endian system, FAST_BIG_ENDIAN is defined -if GRIB_MEM_ALIGN is *not* defined. -On the other hand, for example in src/grib_bits.c, when FAST_BIG_ENDIAN is defined -"grib_bits_fast_big_endian.c" is included, otherwise "grib_bits_any_endian.c" is -included. - -As "grib_bits_any_endian.c" is used also in x86_64 system, it is reasonable to think that -the original intention is that "grib_bits_fast_big_endian.c" needs some alignment -condition, and uses such condition for optimization, otherwise "grib_bits_any_endian.c" -should be used, so it is natural to think that the condition on grib_api_internal.h -is opposite. ---- - src/grib_api_internal.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h -index 3b8fae3c..0c8fcf17 100644 ---- a/src/grib_api_internal.h -+++ b/src/grib_api_internal.h +--- eccodes-2.24.0-Source.unchanged/src/grib_api_internal.h 2021-12-07 12:03:44.000000000 +0100 ++++ eccodes-2.24.0-Source/src/grib_api_internal.h 2021-12-09 10:02:54.686070864 +0100 @@ -40,9 +40,9 @@ extern "C" { #if IS_BIG_ENDIAN @@ -34,6 +12,3 @@ index 3b8fae3c..0c8fcf17 100644 #endif #endif --- -2.33.1 - diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 78e9b89..61b7292 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.23.0-Source.unchanged/fortran/CMakeLists.txt 2021-08-25 11:35:41.000000000 +0200 -+++ eccodes-2.23.0-Source/fortran/CMakeLists.txt 2021-09-01 08:40:58.089840900 +0200 +--- eccodes-2.24.0-Source.unchanged/fortran/CMakeLists.txt 2021-12-07 12:03:44.000000000 +0100 ++++ eccodes-2.24.0-Source/fortran/CMakeLists.txt 2021-12-09 09:57:37.787105551 +0100 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,8 +10,8 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.23.0-Source.unchanged/src/CMakeLists.txt 2021-08-25 11:35:41.000000000 +0200 -+++ eccodes-2.23.0-Source/src/CMakeLists.txt 2021-09-01 08:31:13.559364510 +0200 +--- eccodes-2.24.0-Source.unchanged/src/CMakeLists.txt 2021-12-07 12:03:44.000000000 +0100 ++++ eccodes-2.24.0-Source/src/CMakeLists.txt 2021-12-09 09:57:37.811104942 +0100 @@ -444,6 +444,7 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} diff --git a/eccodes.spec b/eccodes.spec index 3ed79f5..0512a6d 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.23.0 -Release: 2%{?dist} +Version: 2.24.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -8,7 +8,7 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20200626 -# latest fedora-35 grib_api version is 1.27.0-12 +# latest fedora-36 grib_api version is 1.27.0-12 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) @@ -43,18 +43,13 @@ Source1: http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.ta # https://software.ecmwf.int/issues/browse/SUP-1809 Patch1: eccodes-soversion.patch -# Disable versionNumberOfSuperblock checking, since the test expects 0 but -# on Fedora rawhide the code returns a value of 2. -# Issue reported upstream as: https://jira.ecmwf.int/browse/SUP-3497 -Patch2: eccodes-test-grib_to_netcdf.patch - # note that the requests to make the other issues public are filed here: # https://software.ecmwf.int/issues/browse/SUP-2073 # (and again, unfortunately this issue is not public) # grib_api_internal.h: reverse definition of FAST_BIG_ENDIAN # https://jira.ecmwf.int/browse/SUP-2410 -Patch3: eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch +Patch2: eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch BuildRequires: cmake3 BuildRequires: gcc @@ -352,6 +347,10 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu Dec 09 2021 Jos de Kloe - 2.24.0-1 +- Upgrade to upstream version 2.24.0 +- Remove no longer needed patch2 (grib_to_netcdf test fix) + * Wed Dec 1 2021 Mamoru TASAKA - 2.23.0-2 - Patch grib_api_internal.h for big endian test suite issue (upstream bug SUP-2410) diff --git a/sources b/sources index 0317ff5..aaa3ee8 100644 --- a/sources +++ b/sources @@ -4,3 +4,4 @@ SHA512 (eccodes-2.21.0-Source.tar.gz) = f2ba8361b99800646a92f5f5beb7ec2facf2ee3b SHA512 (eccodes-2.22.0-Source.tar.gz) = 488ff560cd9969c2d5c0dd0ce3e6b4433954893758ae1a2bd9177536d8b08a89f37aac4f6a175c271f528d5c838fd4ec7b090dfb1f691df5cfceb67508bdc470 SHA512 (eccodes-2.22.1-Source.tar.gz) = 86818604eca75a34c8ce0cf0540d255c0db2d92bf03970a65c972fb2a16b6c472f6dcebfd04bdac4b76b8db2fcf2ed4dfa8a70875eaf1353a775fc185e5de9a0 SHA512 (eccodes-2.23.0-Source.tar.gz) = df8e9f25396d91ae0adb1b1502cdb6c1473d80caf79ce3fe9318ecc63194fd1c7dc7424fccf44aabf8c06ea343d59093bb21e75f6e5466f21ce44cb514e07350 +SHA512 (eccodes-2.24.0-Source.tar.gz) = cfd1989ff6d733c3053dae75d1951d6ba475dd6a388b6d747c3a87ade3de9a77da8a6954b6a6ea2eb8cfbd3e08aad7a8b12db1561893f8acc2a9041ce7718e24 From 4a460677adb78f46c46aee964e2505fabce4b427 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 01:35:29 +0000 Subject: [PATCH 41/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 0512a6d..0f6b74b 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.24.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -347,6 +347,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.24.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 09 2021 Jos de Kloe - 2.24.0-1 - Upgrade to upstream version 2.24.0 - Remove no longer needed patch2 (grib_to_netcdf test fix) From c6b0799102e15d7f86b386a5cf6d6ea674594e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Sun, 13 Feb 2022 13:45:43 +0100 Subject: [PATCH 42/90] Rebuilt for libjasper.so.6 --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 0f6b74b..f7ed4e2 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.24.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -347,6 +347,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Feb 13 2022 Josef Ridky - 2.24.0-3 +- Rebuilt for libjasper.so.6 + * Thu Jan 20 2022 Fedora Release Engineering - 2.24.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a086e5e7b27c579a9fd0afbc4b7be1ab80956766 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 15 Feb 2022 00:10:55 +0900 Subject: [PATCH 43/90] jasper3: use wrapper entry point for jpeg2000 decoder --- ...24.0-jasper3-use-wrapper-entry-point.patch | 75 +++++++++++++++++++ eccodes.spec | 12 ++- 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch diff --git a/eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch b/eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch new file mode 100644 index 0000000..67548af --- /dev/null +++ b/eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch @@ -0,0 +1,75 @@ +diff -urp -x '*~' -x redhat-linux-build -x '*.list' -x '.package_note*' eccodes-2.24.0-Source/src/grib_jasper_encoding.c eccodes-2.24.0-Source.new/src/grib_jasper_encoding.c +--- eccodes-2.24.0-Source/src/grib_jasper_encoding.c 2021-12-07 20:03:44.000000000 +0900 ++++ eccodes-2.24.0-Source.new/src/grib_jasper_encoding.c 2022-02-14 23:35:10.954255326 +0900 +@@ -30,7 +30,7 @@ int grib_jasper_decode(grib_context* c, + jas_matrix_t* matrix = NULL; + jas_image_cmpt_t* p; + int i, j, k; +- ++ jas_conf_clear(); jas_conf_set_max_mem_usage(jas_get_total_mem_size()); jas_init_library(); jas_init_thread(); + jpeg = jas_stream_memopen((char*)buf, *buflen); + if (!jpeg) { + code = GRIB_DECODING_ERROR; +@@ -39,7 +39,7 @@ int grib_jasper_decode(grib_context* c, + + grib_context_log(c, GRIB_LOG_DEBUG, "grib_jasper_decode: Jasper version %s", jas_getversion()); + +- image = jpc_decode(jpeg, NULL); ++ image = jas_image_decode (jpeg, -1, 0); + if (!image) { + code = GRIB_DECODING_ERROR; + goto cleanup; +@@ -77,7 +77,7 @@ cleanup: + jas_image_destroy(image); + if (jpeg) + jas_stream_close(jpeg); +- ++ jas_cleanup_thread(); jas_cleanup_library(); + return code; + } + +@@ -94,6 +94,7 @@ int grib_jasper_encode(grib_context* c, + long no_values = helper->no_values; + long bits8; + int i; ++ int fmt; + + size_t buflen = 0; + unsigned char* encoded = NULL; +@@ -156,7 +157,7 @@ int grib_jasper_encode(grib_context* c, + } + } + +- /*jas_init();*/ ++ jas_conf_clear(); jas_conf_set_max_mem_usage(jas_get_total_mem_size()); jas_init_library(); jas_init_thread(); + + opts[0] = 0; + +@@ -175,7 +176,8 @@ int grib_jasper_encode(grib_context* c, + cmpt.stream_ = istream; + + jpcstream = jas_stream_memopen((char*)helper->jpeg_buffer, helper->buffer_size); +- jaserr = jpc_encode(&image, jpcstream, opts); ++ fmt = jas_image_strtofmt("jpc"); ++ jaserr = jas_image_encode(&image, jpcstream, fmt, opts); + + if (jaserr != 0) { + /* increase the number of guard bits */ +@@ -189,7 +191,7 @@ int grib_jasper_encode(grib_context* c, + istream = jas_stream_memopen((char*)encoded, buflen); + cmpt.stream_ = istream; + jpcstream = jas_stream_memopen((char*)helper->jpeg_buffer, helper->buffer_size); +- jaserr = jpc_encode(&image, jpcstream, opts); ++ jaserr = jas_image_encode(&image, jpcstream, fmt, opts); + } + + if (jaserr != 0) { +@@ -210,7 +212,7 @@ cleanup: + jas_stream_close(istream); + if (jpcstream) + jas_stream_close(jpcstream); +- ++ jas_cleanup_thread(); jas_cleanup_library(); + return code; + } + diff --git a/eccodes.spec b/eccodes.spec index f7ed4e2..aeabec5 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.24.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -51,6 +51,13 @@ Patch1: eccodes-soversion.patch # https://jira.ecmwf.int/browse/SUP-2410 Patch2: eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch +# jasper3 now hides internal encoder / decoder. Use wrapper entry point +# c.f. https://github.com/jasper-software/jasper/commit/5fe57ac5829ec31396e7eaab59a688da014660af +# Also, now with jasper3, calling jas_stream_memopen (for example) always needs jasper +# library initialization +Patch3: eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch + + BuildRequires: cmake3 BuildRequires: gcc BuildRequires: gcc-gfortran @@ -347,6 +354,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Mon Feb 14 2022 Mamoru TASAKA - 2.24.0-4 +- jasper3: use wrapper entry point for jpeg2000 decoder + * Sun Feb 13 2022 Josef Ridky - 2.24.0-3 - Rebuilt for libjasper.so.6 From 285b274271838ab315308bd6e31c78769ca1e4fe Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 6 Mar 2022 17:17:56 +0100 Subject: [PATCH 44/90] Upgrade to upstream version 2.25.0; Add new BR libaec-devel --- ...nal.h-reverse-definition-of-FAST_BIG_E.patch | 14 -------------- ...ccodes-jasper3-use-wrapper-entry-point.patch | 5 ++--- eccodes-soversion.patch | 10 +++++----- eccodes.spec | 17 +++++++++-------- 4 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch rename eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch => eccodes-jasper3-use-wrapper-entry-point.patch (86%) diff --git a/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch b/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch deleted file mode 100644 index 5df7da7..0000000 --- a/eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- eccodes-2.24.0-Source.unchanged/src/grib_api_internal.h 2021-12-07 12:03:44.000000000 +0100 -+++ eccodes-2.24.0-Source/src/grib_api_internal.h 2021-12-09 10:02:54.686070864 +0100 -@@ -40,9 +40,9 @@ extern "C" { - - #if IS_BIG_ENDIAN - #if GRIB_MEM_ALIGN --#define FAST_BIG_ENDIAN 0 --#else - #define FAST_BIG_ENDIAN 1 -+#else -+#define FAST_BIG_ENDIAN 0 - #endif - #endif - diff --git a/eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch b/eccodes-jasper3-use-wrapper-entry-point.patch similarity index 86% rename from eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch rename to eccodes-jasper3-use-wrapper-entry-point.patch index 67548af..cebee2d 100644 --- a/eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch +++ b/eccodes-jasper3-use-wrapper-entry-point.patch @@ -1,6 +1,5 @@ -diff -urp -x '*~' -x redhat-linux-build -x '*.list' -x '.package_note*' eccodes-2.24.0-Source/src/grib_jasper_encoding.c eccodes-2.24.0-Source.new/src/grib_jasper_encoding.c ---- eccodes-2.24.0-Source/src/grib_jasper_encoding.c 2021-12-07 20:03:44.000000000 +0900 -+++ eccodes-2.24.0-Source.new/src/grib_jasper_encoding.c 2022-02-14 23:35:10.954255326 +0900 +--- eccodes-2.25.0-Source.unchanged/src/grib_jasper_encoding.c 2022-03-03 15:40:43.000000000 +0100 ++++ eccodes-2.25.0-Source/src/grib_jasper_encoding.c 2022-03-06 16:18:43.875617700 +0100 @@ -30,7 +30,7 @@ int grib_jasper_decode(grib_context* c, jas_matrix_t* matrix = NULL; jas_image_cmpt_t* p; diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 61b7292..c1cd6b2 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.24.0-Source.unchanged/fortran/CMakeLists.txt 2021-12-07 12:03:44.000000000 +0100 -+++ eccodes-2.24.0-Source/fortran/CMakeLists.txt 2021-12-09 09:57:37.787105551 +0100 +--- eccodes-2.25.0-Source.unchanged/fortran/CMakeLists.txt 2022-03-03 15:40:42.000000000 +0100 ++++ eccodes-2.25.0-Source/fortran/CMakeLists.txt 2022-03-06 15:40:01.323606416 +0100 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.24.0-Source.unchanged/src/CMakeLists.txt 2021-12-07 12:03:44.000000000 +0100 -+++ eccodes-2.24.0-Source/src/CMakeLists.txt 2021-12-09 09:57:37.811104942 +0100 -@@ -444,6 +444,7 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.25.0-Source.unchanged/src/CMakeLists.txt 2022-03-03 15:40:42.000000000 +0100 ++++ eccodes-2.25.0-Source/src/CMakeLists.txt 2022-03-06 15:40:01.324606392 +0100 +@@ -437,6 +437,7 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${grib_api_extra_srcs} diff --git a/eccodes.spec b/eccodes.spec index aeabec5..2e1bdd5 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.24.0 -Release: 4%{?dist} +Version: 2.25.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -32,7 +32,7 @@ Summary: WMO data format decoding and encoding License: ASL 2.0 -URL: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home +URL: https://confluence.ecmwf.int/display/ECC/ecCodes+Home Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-%{version}-Source.tar.gz # note: this data package is unversioned upstream but still it is updated # now and then so rename the datapack using the download date @@ -47,15 +47,11 @@ Patch1: eccodes-soversion.patch # https://software.ecmwf.int/issues/browse/SUP-2073 # (and again, unfortunately this issue is not public) -# grib_api_internal.h: reverse definition of FAST_BIG_ENDIAN -# https://jira.ecmwf.int/browse/SUP-2410 -Patch2: eccodes-grib_api_internal.h-reverse-definition-of-FAST_BIG_E.patch - # jasper3 now hides internal encoder / decoder. Use wrapper entry point # c.f. https://github.com/jasper-software/jasper/commit/5fe57ac5829ec31396e7eaab59a688da014660af # Also, now with jasper3, calling jas_stream_memopen (for example) always needs jasper # library initialization -Patch3: eccodes-2.24.0-jasper3-use-wrapper-entry-point.patch +Patch2: eccodes-jasper3-use-wrapper-entry-point.patch BuildRequires: cmake3 @@ -67,6 +63,7 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: netcdf-devel BuildRequires: openjpeg2-devel +BuildRequires: libaec-devel # For tests BuildRequires: perl(Getopt::Long) @@ -354,6 +351,10 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Mar 06 2022 Jos de Kloe - 2.25.0-1 +- Upgrade to upstream version 2.25.0 +- Add new BR libaec-devel + * Mon Feb 14 2022 Mamoru TASAKA - 2.24.0-4 - jasper3: use wrapper entry point for jpeg2000 decoder From 277f1158773ab44b8886626bce614888f03ebcbc Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 6 Mar 2022 17:20:32 +0100 Subject: [PATCH 45/90] add new sources --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index dcaab7e..ea782d6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /eccodes-2.22.1-Source.tar.gz /eccodes-2.23.0-Source.tar.gz /eccodes-2.24.0-Source.tar.gz +/eccodes-2.25.0-Source.tar.gz diff --git a/sources b/sources index aaa3ee8..45bc82a 100644 --- a/sources +++ b/sources @@ -5,3 +5,4 @@ SHA512 (eccodes-2.22.0-Source.tar.gz) = 488ff560cd9969c2d5c0dd0ce3e6b44339548937 SHA512 (eccodes-2.22.1-Source.tar.gz) = 86818604eca75a34c8ce0cf0540d255c0db2d92bf03970a65c972fb2a16b6c472f6dcebfd04bdac4b76b8db2fcf2ed4dfa8a70875eaf1353a775fc185e5de9a0 SHA512 (eccodes-2.23.0-Source.tar.gz) = df8e9f25396d91ae0adb1b1502cdb6c1473d80caf79ce3fe9318ecc63194fd1c7dc7424fccf44aabf8c06ea343d59093bb21e75f6e5466f21ce44cb514e07350 SHA512 (eccodes-2.24.0-Source.tar.gz) = cfd1989ff6d733c3053dae75d1951d6ba475dd6a388b6d747c3a87ade3de9a77da8a6954b6a6ea2eb8cfbd3e08aad7a8b12db1561893f8acc2a9041ce7718e24 +SHA512 (eccodes-2.25.0-Source.tar.gz) = b6c675e9bb7377120ae0eb5f1601c3980925b78f240aa26e46cf50ce0d64c5566a4191c83b2ca6ab11fcbcadb70bad1f2c4e188adc245dcf2237292bd359078d From 6a1c7f8e6986c96fb4d163ec573e73c2545c44a9 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 21 May 2022 00:10:53 +0200 Subject: [PATCH 46/90] Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 2e1bdd5..0ee87a0 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.25.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -351,6 +351,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Fri May 20 2022 Sandro Mani - 2.25.0-2 +- Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 + * Sun Mar 06 2022 Jos de Kloe - 2.25.0-1 - Upgrade to upstream version 2.25.0 - Add new BR libaec-devel From 2378143ac93fefd19076d42b7139ebbbb3a41b9c Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 26 May 2022 15:00:04 +0200 Subject: [PATCH 47/90] update to new version 2.26.0 --- eccodes-jasper3-use-wrapper-entry-point.patch | 74 ------------------- eccodes-soversion.patch | 15 ++-- eccodes.spec | 25 ++----- 3 files changed, 14 insertions(+), 100 deletions(-) delete mode 100644 eccodes-jasper3-use-wrapper-entry-point.patch diff --git a/eccodes-jasper3-use-wrapper-entry-point.patch b/eccodes-jasper3-use-wrapper-entry-point.patch deleted file mode 100644 index cebee2d..0000000 --- a/eccodes-jasper3-use-wrapper-entry-point.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- eccodes-2.25.0-Source.unchanged/src/grib_jasper_encoding.c 2022-03-03 15:40:43.000000000 +0100 -+++ eccodes-2.25.0-Source/src/grib_jasper_encoding.c 2022-03-06 16:18:43.875617700 +0100 -@@ -30,7 +30,7 @@ int grib_jasper_decode(grib_context* c, - jas_matrix_t* matrix = NULL; - jas_image_cmpt_t* p; - int i, j, k; -- -+ jas_conf_clear(); jas_conf_set_max_mem_usage(jas_get_total_mem_size()); jas_init_library(); jas_init_thread(); - jpeg = jas_stream_memopen((char*)buf, *buflen); - if (!jpeg) { - code = GRIB_DECODING_ERROR; -@@ -39,7 +39,7 @@ int grib_jasper_decode(grib_context* c, - - grib_context_log(c, GRIB_LOG_DEBUG, "grib_jasper_decode: Jasper version %s", jas_getversion()); - -- image = jpc_decode(jpeg, NULL); -+ image = jas_image_decode (jpeg, -1, 0); - if (!image) { - code = GRIB_DECODING_ERROR; - goto cleanup; -@@ -77,7 +77,7 @@ cleanup: - jas_image_destroy(image); - if (jpeg) - jas_stream_close(jpeg); -- -+ jas_cleanup_thread(); jas_cleanup_library(); - return code; - } - -@@ -94,6 +94,7 @@ int grib_jasper_encode(grib_context* c, - long no_values = helper->no_values; - long bits8; - int i; -+ int fmt; - - size_t buflen = 0; - unsigned char* encoded = NULL; -@@ -156,7 +157,7 @@ int grib_jasper_encode(grib_context* c, - } - } - -- /*jas_init();*/ -+ jas_conf_clear(); jas_conf_set_max_mem_usage(jas_get_total_mem_size()); jas_init_library(); jas_init_thread(); - - opts[0] = 0; - -@@ -175,7 +176,8 @@ int grib_jasper_encode(grib_context* c, - cmpt.stream_ = istream; - - jpcstream = jas_stream_memopen((char*)helper->jpeg_buffer, helper->buffer_size); -- jaserr = jpc_encode(&image, jpcstream, opts); -+ fmt = jas_image_strtofmt("jpc"); -+ jaserr = jas_image_encode(&image, jpcstream, fmt, opts); - - if (jaserr != 0) { - /* increase the number of guard bits */ -@@ -189,7 +191,7 @@ int grib_jasper_encode(grib_context* c, - istream = jas_stream_memopen((char*)encoded, buflen); - cmpt.stream_ = istream; - jpcstream = jas_stream_memopen((char*)helper->jpeg_buffer, helper->buffer_size); -- jaserr = jpc_encode(&image, jpcstream, opts); -+ jaserr = jas_image_encode(&image, jpcstream, fmt, opts); - } - - if (jaserr != 0) { -@@ -210,7 +212,7 @@ cleanup: - jas_stream_close(istream); - if (jpcstream) - jas_stream_close(jpcstream); -- -+ jas_cleanup_thread(); jas_cleanup_library(); - return code; - } - diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index c1cd6b2..0cf8084 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.25.0-Source.unchanged/fortran/CMakeLists.txt 2022-03-03 15:40:42.000000000 +0100 -+++ eccodes-2.25.0-Source/fortran/CMakeLists.txt 2022-03-06 15:40:01.323606416 +0100 +--- eccodes-2.26.0-Source.unchanged/fortran/CMakeLists.txt 2022-05-18 13:20:10.000000000 +0200 ++++ eccodes-2.26.0-Source/fortran/CMakeLists.txt 2022-05-26 14:15:01.080533587 +0200 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,13 +10,14 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.25.0-Source.unchanged/src/CMakeLists.txt 2022-03-03 15:40:42.000000000 +0100 -+++ eccodes-2.25.0-Source/src/CMakeLists.txt 2022-03-06 15:40:01.324606392 +0100 -@@ -437,6 +437,7 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.26.0-Source.unchanged/src/CMakeLists.txt 2022-05-18 13:20:10.000000000 +0200 ++++ eccodes-2.26.0-Source/src/CMakeLists.txt 2022-05-26 14:18:49.300260787 +0200 +@@ -437,6 +437,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} - TEMPLATES ${grib_api_extra_srcs} -+ SOVERSION ${ECCODES_SOVERSION} + TEMPLATES ${eccodes_extra_src_files} ++ SOVERSION ${ECCODES_SOVERSION} ++ INSTALL_HEADERS_LIST grib_api.h eccodes.h diff --git a/eccodes.spec b/eccodes.spec index 0ee87a0..d5c01de 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,12 +1,12 @@ Name: eccodes -Version: 2.25.0 -Release: 2%{?dist} +Version: 2.26.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions %global so_version 0.1 %global so_version_f90 0.1 -%global datapack_date 20200626 +%global datapack_date 20220526 # latest fedora-36 grib_api version is 1.27.0-12 # but this version number is to be updated as soon as we know @@ -47,13 +47,6 @@ Patch1: eccodes-soversion.patch # https://software.ecmwf.int/issues/browse/SUP-2073 # (and again, unfortunately this issue is not public) -# jasper3 now hides internal encoder / decoder. Use wrapper entry point -# c.f. https://github.com/jasper-software/jasper/commit/5fe57ac5829ec31396e7eaab59a688da014660af -# Also, now with jasper3, calling jas_stream_memopen (for example) always needs jasper -# library initialization -Patch2: eccodes-jasper3-use-wrapper-entry-point.patch - - BuildRequires: cmake3 BuildRequires: gcc BuildRequires: gcc-gfortran @@ -185,13 +178,6 @@ pushd %{_vpath_builddir} tar xf %SOURCE1 popd -# remove executable permissions from c files -chmod 644 tigge/*.c -chmod 644 tools/*.c - -# remove executable permissions from the authors and license file -chmod 644 AUTHORS LICENSE - %build #-- The following features are disabled by default and not switched on: @@ -270,8 +256,6 @@ rm %{buildroot}%{_datadir}/%{name}/definitions/installDefinitions.sh # copy the html documentation to the install directory mkdir -p %{buildroot}%{_datadir}/doc/%{name}/ cp -r html %{buildroot}%{_datadir}/doc/%{name}/ -# and remove an unneeded Makefile from the html directory -rm %{buildroot}%{_datadir}/doc/%{name}/html/Makefile.am # copy the example scripts/programs to the install directory # but dont copy the shell scripts and Makefiles, since these @@ -351,6 +335,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu May 26 2022 Jos de Kloe - 2.26.0-1 +- Upgrade to upstream version 2.26.0 + * Fri May 20 2022 Sandro Mani - 2.25.0-2 - Rebuild for gdal-3.5.0 and/or openjpeg-2.5.0 From bc33423cd0bedc2054faf5050ebde8f3cfead959 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 26 May 2022 15:05:03 +0200 Subject: [PATCH 48/90] add new source code, new datapack, and remove some old patch files --- .gitignore | 22 ++------------------- eccodes-32bit.patch | 33 ------------------------------- eccodes-test-grib_to_netcdf.patch | 15 -------------- sources | 10 ++-------- 4 files changed, 4 insertions(+), 76 deletions(-) delete mode 100644 eccodes-32bit.patch delete mode 100644 eccodes-test-grib_to_netcdf.patch diff --git a/.gitignore b/.gitignore index ea782d6..b3652b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,2 @@ -/eccodes_test_data.tar.gz -/eccodes_test_data_20181010.tar.gz -/eccodes-2.12.0-Source.tar.gz -/eccodes-2.12.5-Source.tar.gz -/eccodes-2.13.0-Source.tar.gz -/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 -/eccodes-2.18.0-Source.tar.gz -/eccodes_test_data_20200626.tar.gz -/eccodes-2.19.0-Source.tar.gz -/eccodes-2.19.1-Source.tar.gz -/eccodes-2.20.0-Source.tar.gz -/eccodes-2.21.0-Source.tar.gz -/eccodes-2.22.0-Source.tar.gz -/eccodes-2.22.1-Source.tar.gz -/eccodes-2.23.0-Source.tar.gz -/eccodes-2.24.0-Source.tar.gz -/eccodes-2.25.0-Source.tar.gz +/eccodes-2.26.0-Source.tar.gz +/eccodes_test_data_20220526.tar.gz diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch deleted file mode 100644 index 8bf6d79..0000000 --- a/eccodes-32bit.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- eccodes-2.19.0-Source.unchanged/src/grib_api_prototypes.h 2020-10-15 13:21:34.000000000 +0200 -+++ eccodes-2.19.0-Source/src/grib_api_prototypes.h 2020-10-16 08:52:25.171175169 +0200 -@@ -859,8 +859,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); --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.19.0-Source.unchanged/src/grib_ieeefloat.c 2020-10-15 13:21:34.000000000 +0200 -+++ eccodes-2.19.0-Source/src/grib_ieeefloat.c 2020-10-16 09:01:37.712934707 +0200 -@@ -442,7 +442,7 @@ unsigned long grib_ieee_to_long(double x - * Byte swapping is actually implemented in grib_decode_unsigned_long and - * grib_encode_unsigned_long. - */ --unsigned long grib_ieee64_to_long(double x) -+uint64_t grib_ieee64_to_long(double x) - { - unsigned long lval; - DebugAssert(sizeof(double) == sizeof(long)); -@@ -450,7 +450,7 @@ unsigned long grib_ieee64_to_long(double - return lval; - } - --double grib_long_to_ieee64(unsigned long x) -+double grib_long_to_ieee64(uint64_t x) - { - double dval; - DebugAssert(sizeof(double) == sizeof(long)); diff --git a/eccodes-test-grib_to_netcdf.patch b/eccodes-test-grib_to_netcdf.patch deleted file mode 100644 index eff2a26..0000000 --- a/eccodes-test-grib_to_netcdf.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- eccodes-2.23.0-Source.unchanged/tests/grib_to_netcdf.sh 2021-08-25 11:35:41.000000000 +0200 -+++ eccodes-2.23.0-Source/tests/grib_to_netcdf.sh 2021-09-02 10:31:33.417295119 +0200 -@@ -64,8 +64,10 @@ if [ $ECCODES_ON_WINDOWS -eq 0 ]; then - set -e - if [ $stat -eq 0 ]; then - have_netcdf4=1 -- res=`${tools_dir}/grib_get -TA -p identifier,versionNumberOfSuperblock $tempNetcdf` -- [ "$res" = "HDF5 0" ] -+# res=`${tools_dir}/grib_get -TA -p identifier,versionNumberOfSuperblock $tempNetcdf` -+# [ "$res" = "HDF5 0" ] -+ res=`${tools_dir}/grib_get -TA -p identifier $tempNetcdf` -+ [ "$res" = "HDF5" ] - fi - fi - diff --git a/sources b/sources index 45bc82a..6d7fcc8 100644 --- a/sources +++ b/sources @@ -1,8 +1,2 @@ -SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e -SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d1caf60614ececfe2fabe07d7c794baf120f5df82716f37b2540f7f6a6cd82f04070a78bf65dc7d499ca50dc0 -SHA512 (eccodes-2.21.0-Source.tar.gz) = f2ba8361b99800646a92f5f5beb7ec2facf2ee3b8a3f7985d9681a23b2faae778004c8c688ebe4b3a8492e99c76422c66ecc8943d12d3342d5bc1d38362ccf06 -SHA512 (eccodes-2.22.0-Source.tar.gz) = 488ff560cd9969c2d5c0dd0ce3e6b4433954893758ae1a2bd9177536d8b08a89f37aac4f6a175c271f528d5c838fd4ec7b090dfb1f691df5cfceb67508bdc470 -SHA512 (eccodes-2.22.1-Source.tar.gz) = 86818604eca75a34c8ce0cf0540d255c0db2d92bf03970a65c972fb2a16b6c472f6dcebfd04bdac4b76b8db2fcf2ed4dfa8a70875eaf1353a775fc185e5de9a0 -SHA512 (eccodes-2.23.0-Source.tar.gz) = df8e9f25396d91ae0adb1b1502cdb6c1473d80caf79ce3fe9318ecc63194fd1c7dc7424fccf44aabf8c06ea343d59093bb21e75f6e5466f21ce44cb514e07350 -SHA512 (eccodes-2.24.0-Source.tar.gz) = cfd1989ff6d733c3053dae75d1951d6ba475dd6a388b6d747c3a87ade3de9a77da8a6954b6a6ea2eb8cfbd3e08aad7a8b12db1561893f8acc2a9041ce7718e24 -SHA512 (eccodes-2.25.0-Source.tar.gz) = b6c675e9bb7377120ae0eb5f1601c3980925b78f240aa26e46cf50ce0d64c5566a4191c83b2ca6ab11fcbcadb70bad1f2c4e188adc245dcf2237292bd359078d +SHA512 (eccodes-2.26.0-Source.tar.gz) = cd4fd2048ad98a4a5c82a0a233b2e64eb67a195d42637607423669351b6cd295b111a382f6d9ecb05ffe25f79599bf3963550ca27d84e7f9ef55e499e183a35f +SHA512 (eccodes_test_data_20220526.tar.gz) = 0457878caad6a3395daf60e27cfb72121526065b0cf4da144c7499b8d38bebae0952ddbd20ef0eb53fad77ada60160039340da01001f19fbb7fb1ccbb3d0547a From 9002d2d5b9e82b22068b1d7202514cb0c3c4666d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 01:34:52 +0000 Subject: [PATCH 49/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index d5c01de..29e7f69 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -335,6 +335,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.26.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu May 26 2022 Jos de Kloe - 2.26.0-1 - Upgrade to upstream version 2.26.0 From 986b16e6eec96ff8ddcb1a4d8f18f38acd982b93 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Mon, 29 Aug 2022 14:16:53 +0200 Subject: [PATCH 50/90] Upgrade to upstream version 2.27.0 and add generation of man pages for tools that support the --help option --- .gitignore | 1 + eccodes-soversion.patch | 10 +++++----- eccodes.spec | 40 ++++++++++++++++++++++++++++++------- eccodes_create_man_pages.sh | 28 ++++++++++++++++++++++++++ sources | 1 + 5 files changed, 68 insertions(+), 12 deletions(-) create mode 100755 eccodes_create_man_pages.sh diff --git a/.gitignore b/.gitignore index b3652b6..a6d3f83 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /eccodes-2.26.0-Source.tar.gz /eccodes_test_data_20220526.tar.gz +/eccodes-2.27.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 0cf8084..bf49da1 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.26.0-Source.unchanged/fortran/CMakeLists.txt 2022-05-18 13:20:10.000000000 +0200 -+++ eccodes-2.26.0-Source/fortran/CMakeLists.txt 2022-05-26 14:15:01.080533587 +0200 +--- eccodes-2.27.0-Source.unchanged/fortran/CMakeLists.txt 2022-08-24 14:01:27.000000000 +0200 ++++ eccodes-2.27.0-Source/fortran/CMakeLists.txt 2022-08-28 11:34:40.919639227 +0200 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.26.0-Source.unchanged/src/CMakeLists.txt 2022-05-18 13:20:10.000000000 +0200 -+++ eccodes-2.26.0-Source/src/CMakeLists.txt 2022-05-26 14:18:49.300260787 +0200 -@@ -437,6 +437,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.27.0-Source.unchanged/src/CMakeLists.txt 2022-08-24 14:01:27.000000000 +0200 ++++ eccodes-2.27.0-Source/src/CMakeLists.txt 2022-08-28 11:34:40.941638710 +0200 +@@ -446,6 +446,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index 29e7f69..eb1d9aa 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.26.0 -Release: 2%{?dist} +Version: 2.27.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -8,7 +8,7 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20220526 -# latest fedora-36 grib_api version is 1.27.0-12 +# latest fedora-38/rawhide grib_api version is 1.27.0-16 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) @@ -16,7 +16,7 @@ Summary: WMO data format decoding and encoding # (Note that this page is no longer available, 17-Oct-2020) %global final_grib_api_version 1.28.1-1%{?dist} -%ifarch i686 ppc64 s390x armv7hl +%ifarch i686 ppc64 armv7hl %global obsolete_grib_api 0 %else %global obsolete_grib_api 1 @@ -33,18 +33,22 @@ Summary: WMO data format decoding and encoding License: ASL 2.0 URL: https://confluence.ecmwf.int/display/ECC/ecCodes+Home -Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-%{version}-Source.tar.gz +Source0: https://confluence.ecmwf.int/download/attachments/45757960/eccodes-%{version}-Source.tar.gz + # note: this data package is unversioned upstream but still it is updated # now and then so rename the datapack using the download date # to make it versioned in fedora Source1: http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz#/eccodes_test_data_%{datapack_date}.tar.gz +# a custom script to create man pages +Source2: eccodes_create_man_pages.sh + # Add soversion to the shared libraries, since upstream refuses to do so -# https://software.ecmwf.int/issues/browse/SUP-1809 +# https://jira.ecmwf.int/browse/SUP-1809 Patch1: eccodes-soversion.patch # note that the requests to make the other issues public are filed here: -# https://software.ecmwf.int/issues/browse/SUP-2073 +# https://jira.ecmwf.int/browse/SUP-2073 # (and again, unfortunately this issue is not public) BuildRequires: cmake3 @@ -63,6 +67,9 @@ BuildRequires: perl(Getopt::Long) BuildRequires: perl(Test::More) BuildRequires: perl(File::Compare) +# For creation of man pages +BuildRequires: help2man + # 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 # installing the base package. It will probably be pretty useless, @@ -269,6 +276,20 @@ cp examples/C/*.c %{buildroot}%{_datadir}/doc/%{name}/examples/C mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/F90 cp examples/F90/*.f90 %{buildroot}%{_datadir}/doc/%{name}/examples/F90 +# create man pages for the tools that support the --help option +# since upstream does not provide them. +LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ +%{_sourcedir}/eccodes_create_man_pages.sh \ + %{_vpath_builddir}/bin \ + %{_vpath_builddir}/man + +# copy the created man pages to the install directory +mkdir -p %{buildroot}%{_datadir}/man/man1 +cp %{_vpath_builddir}/man/*.1 %{buildroot}%{_datadir}/man/man1 + +# Fix permissions +chmod 644 AUTHORS + # also not needed for x86_64 # maybe they fixed it for all archs? #%%ifarch i686 armv7hl @@ -314,6 +335,7 @@ ctest3 -V %{?_smp_mflags} %doc README.md ChangeLog AUTHORS NEWS NOTICE %{_bindir}/* %{_libdir}/*.so.* +%{_mandir}/man1/*.1* %files devel %{_includedir}/* @@ -335,6 +357,10 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Mon Aug 29 2022 Jos de Kloe - 2.27.0-1 +- Upgrade to upstream version 2.27.0 +- Added generation of man pages for tools that support the --help option + * Thu Jul 21 2022 Fedora Release Engineering - 2.26.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/eccodes_create_man_pages.sh b/eccodes_create_man_pages.sh new file mode 100755 index 0000000..6ca4bfe --- /dev/null +++ b/eccodes_create_man_pages.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# a simple script to create man pages for tools +# provided in the bin dir after installation of eccodes. +# +# Written by: J. de Kloe, 2022. + +BINDIR=$1 +DESTDIR=$2 + +if [ ! -e "$DESTDIR" ] ; then + mkdir -p "$DESTDIR" +fi + +for TOOL in "$BINDIR"/* +do + BASENAME=$(basename "$TOOL") + help2man --no-info --output="${DESTDIR}/${BASENAME}.1" "${TOOL}" +done + +# currently (29-Aug-2022) help2man fails on these 5 tools: +# help2man: can't get `--help' info from ../bin/bufr_count +# help2man: can't get `--help' info from ../bin/codes_count +# help2man: can't get `--help' info from ../bin/grib2ppm +# help2man: can't get `--help' info from ../bin/grib_count +# help2man: can't get `--help' info from ../bin/gts_count + +echo "done" diff --git a/sources b/sources index 6d7fcc8..8fdbe94 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (eccodes-2.26.0-Source.tar.gz) = cd4fd2048ad98a4a5c82a0a233b2e64eb67a195d42637607423669351b6cd295b111a382f6d9ecb05ffe25f79599bf3963550ca27d84e7f9ef55e499e183a35f SHA512 (eccodes_test_data_20220526.tar.gz) = 0457878caad6a3395daf60e27cfb72121526065b0cf4da144c7499b8d38bebae0952ddbd20ef0eb53fad77ada60160039340da01001f19fbb7fb1ccbb3d0547a +SHA512 (eccodes-2.27.0-Source.tar.gz) = b33d9a4b4abeaa2fae632fe6a4e19071769282c80b7f91f1aaa57f9908386b7c6bd842de69c4bb1b7da2bc3298b5248c808f5c94909033ef5c4a764ae85db5fa From f6edb54b9551d87ba854130b6ef2deba6d6b57a0 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 10 Dec 2022 14:18:44 +0100 Subject: [PATCH 51/90] Upgrade to upstream version 2.27.1 and SPDX migration --- .gitignore | 1 + eccodes-soversion.patch | 8 +++--- eccodes.rpmlintrc | 56 ----------------------------------------- eccodes.spec | 17 +++++++++---- sources | 1 + 5 files changed, 18 insertions(+), 65 deletions(-) delete mode 100644 eccodes.rpmlintrc diff --git a/.gitignore b/.gitignore index a6d3f83..768be79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /eccodes-2.26.0-Source.tar.gz /eccodes_test_data_20220526.tar.gz /eccodes-2.27.0-Source.tar.gz +/eccodes-2.27.1-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index bf49da1..401214a 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.27.0-Source.unchanged/fortran/CMakeLists.txt 2022-08-24 14:01:27.000000000 +0200 -+++ eccodes-2.27.0-Source/fortran/CMakeLists.txt 2022-08-28 11:34:40.919639227 +0200 +--- eccodes-2.27.1-Source.unchanged/fortran/CMakeLists.txt 2022-12-02 23:16:06.000000000 +0100 ++++ eccodes-2.27.1-Source/fortran/CMakeLists.txt 2022-12-10 13:14:25.048238392 +0100 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,8 +10,8 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.27.0-Source.unchanged/src/CMakeLists.txt 2022-08-24 14:01:27.000000000 +0200 -+++ eccodes-2.27.0-Source/src/CMakeLists.txt 2022-08-28 11:34:40.941638710 +0200 +--- eccodes-2.27.1-Source.unchanged/src/CMakeLists.txt 2022-12-02 23:16:06.000000000 +0100 ++++ eccodes-2.27.1-Source/src/CMakeLists.txt 2022-12-10 13:14:25.070237838 +0100 @@ -446,6 +446,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc deleted file mode 100644 index 60064d2..0000000 --- a/eccodes.rpmlintrc +++ /dev/null @@ -1,56 +0,0 @@ -# use like this: -# rpmlint --file eccodes.rpmlintrc *.rpm -# example: addFilter ("^foo-.*regex-match-for-rpmlint-warning") - -# these are invalid spelling warnings. GRIB and BUFR are correct, since these are -# the names of the data files that this software handles. -# the description itself is a 1-to-1 copy of what the (UK-based) upstream -# writes, and I am not going to translate this to US spelling ... -addFilter ("W: spelling-error %description -l en_US behaviour -> behavior") -addFilter ("W: spelling-error %description -l en_US grib ->") -addFilter ("W: spelling-error %description -l en_US bufr ->") - -# this data file with wrong line ending has been added to the software on purpose -# for testing purposes, so this is no mistake -addFilter ("eccodes-doc.noarch: W: wrong-file-end-of-line-encoding /usr/share/doc/eccodes/examples/python/flight_data.csv") - -# these data files are no scripts. The dataformat just has an unfortunate first line -# starting with #! so it resembles a shebang line. -# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.0.def") -addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.0.def") -addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.83.def") -addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.83.def") - -# this is a false error (its an rpmlint bug). -# the spec file now uses %ldconfig_scriptlets in stead of the old ldconfig-postin/postun -# see also comment #18 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes.so.0.1") -addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes.so.0.1") -addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes_f90.so.0.1") -addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes_f90.so.0.1") - -# this is an rpmlint bug -# see also comment #8 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("eccodes-debuginfo.x86_64: E: useless-provides debuginfo\(build-id\)") - -# there is no full compatibility between the old grib_api and the new eccodes -# so only obsoletes can be used bu no provides. -# see also comment #21 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("^eccodes.x86_64: W: obsolete-not-provided grib_api") -addFilter ("^eccodes-devel.x86_64: W: obsolete-not-provided grib_api-devel") -addFilter ("^eccodes-devel.x86_64: W: only-non-binary-in-usr-lib") - -# documentation is in a dedicated doc subpackage, -# so these warnings have no merit -addFilter ("python2-eccodes.x86_64: W: no-documentation") -addFilter ("eccodes-debugsource.x86_64: W: no-documentation") -addFilter ("eccodes-devel.x86_64: W: no-documentation") -addFilter ("eccodes-data.noarch: W: no-documentation") - -# temporary disable the man page warning, since it obscures other problems that -# may be more important, and it has already been reported upstream -# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("eccodes.x86_64: W: no-manual-page-for-binary") - -# addFilter ("") diff --git a/eccodes.spec b/eccodes.spec index eb1d9aa..bb0df97 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.27.0 +Version: 2.27.1 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -30,7 +30,7 @@ Summary: WMO data format decoding and encoding # contain a special exception clause that allows them to be # relicensed if they are included in a larger project -License: ASL 2.0 +License: Apache-2.0 URL: https://confluence.ecmwf.int/display/ECC/ecCodes+Home Source0: https://confluence.ecmwf.int/download/attachments/45757960/eccodes-%{version}-Source.tar.gz @@ -278,10 +278,11 @@ cp examples/F90/*.f90 %{buildroot}%{_datadir}/doc/%{name}/examples/F90 # create man pages for the tools that support the --help option # since upstream does not provide them. +# Source2 points to the script eccodes_create_man_pages.sh +# used to generate the man pages. LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ -%{_sourcedir}/eccodes_create_man_pages.sh \ - %{_vpath_builddir}/bin \ - %{_vpath_builddir}/man +%{SOURCE2} %{_vpath_builddir}/bin \ + %{_vpath_builddir}/man # copy the created man pages to the install directory mkdir -p %{buildroot}%{_datadir}/man/man1 @@ -357,6 +358,12 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sat Dec 10 2022 Jos de Kloe - 2.27.1-1 +- Upgrade to upstream version 2.27.1 and SPDX migration + +* Wed Sep 14 2022 Jos de Kloe - 2.27.0-2 +- fix problem with use of _sourcedir + * Mon Aug 29 2022 Jos de Kloe - 2.27.0-1 - Upgrade to upstream version 2.27.0 - Added generation of man pages for tools that support the --help option diff --git a/sources b/sources index 8fdbe94..4b450ec 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (eccodes-2.26.0-Source.tar.gz) = cd4fd2048ad98a4a5c82a0a233b2e64eb67a195d42637607423669351b6cd295b111a382f6d9ecb05ffe25f79599bf3963550ca27d84e7f9ef55e499e183a35f SHA512 (eccodes_test_data_20220526.tar.gz) = 0457878caad6a3395daf60e27cfb72121526065b0cf4da144c7499b8d38bebae0952ddbd20ef0eb53fad77ada60160039340da01001f19fbb7fb1ccbb3d0547a SHA512 (eccodes-2.27.0-Source.tar.gz) = b33d9a4b4abeaa2fae632fe6a4e19071769282c80b7f91f1aaa57f9908386b7c6bd842de69c4bb1b7da2bc3298b5248c808f5c94909033ef5c4a764ae85db5fa +SHA512 (eccodes-2.27.1-Source.tar.gz) = 51ba1f53913a6ae7d28f5ffc393a2ac76547be0f88e4b1700601d36863a46135e3164bc36db48d41287aa3e535664d534d0c3ca347eeb6390d6a6ac4df4fd55c From 0573e805216ac51990c849b2da84fb3dddf952b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 02:03:49 +0000 Subject: [PATCH 52/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index bb0df97..89c0260 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.27.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -358,6 +358,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.27.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Dec 10 2022 Jos de Kloe - 2.27.1-1 - Upgrade to upstream version 2.27.1 and SPDX migration From 5d93d468edd6c804c324b383d0367531c3df23cb Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 12 Feb 2023 14:31:37 +0100 Subject: [PATCH 53/90] update to new upstream version 2.28.0 --- .gitignore | 1 + eccodes-soversion.patch | 8 ++++---- eccodes.rpmlintrc | 13 +++++++++++++ eccodes.spec | 11 +++++++---- sources | 1 + 5 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 eccodes.rpmlintrc diff --git a/.gitignore b/.gitignore index 768be79..88c4776 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /eccodes_test_data_20220526.tar.gz /eccodes-2.27.0-Source.tar.gz /eccodes-2.27.1-Source.tar.gz +/eccodes-2.28.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 401214a..3ed1fa1 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.27.1-Source.unchanged/fortran/CMakeLists.txt 2022-12-02 23:16:06.000000000 +0100 -+++ eccodes-2.27.1-Source/fortran/CMakeLists.txt 2022-12-10 13:14:25.048238392 +0100 +--- eccodes-2.28.0-Source.unchanged/fortran/CMakeLists.txt 2023-01-26 15:41:54.000000000 +0100 ++++ eccodes-2.28.0-Source/fortran/CMakeLists.txt 2023-02-12 11:32:34.172600699 +0100 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,8 +10,8 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.27.1-Source.unchanged/src/CMakeLists.txt 2022-12-02 23:16:06.000000000 +0100 -+++ eccodes-2.27.1-Source/src/CMakeLists.txt 2022-12-10 13:14:25.070237838 +0100 +--- eccodes-2.28.0-Source.unchanged/src/CMakeLists.txt 2023-01-26 15:41:54.000000000 +0100 ++++ eccodes-2.28.0-Source/src/CMakeLists.txt 2023-02-12 11:32:34.190600251 +0100 @@ -446,6 +446,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc new file mode 100644 index 0000000..b6c8fb4 --- /dev/null +++ b/eccodes.rpmlintrc @@ -0,0 +1,13 @@ + +# Disable warning on duplicate files. +# This package uses a huge number (1990 cases at the time of wrinting) +# duplicates in the tables definitions, and patching this is totally +# out of scope for my limited time. +addFilter(r" W: files-duplicate ") +addFilter(r" E: files-duplicated-waste ") + +# Disable warnings on missing man pages. +# The tools that have --help output have been fixed by using help2man. +# The remaining ones have no help output whatsoever and are not easy to fix. +addFilter(r" W: no-manual-page-for-binary ") + diff --git a/eccodes.spec b/eccodes.spec index 89c0260..3dc1592 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.27.1 -Release: 2%{?dist} +Version: 2.28.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -8,7 +8,7 @@ Summary: WMO data format decoding and encoding %global so_version_f90 0.1 %global datapack_date 20220526 -# latest fedora-38/rawhide grib_api version is 1.27.0-16 +# latest fedora-38/rawhide grib_api version is 1.27.0-18 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) @@ -289,7 +289,7 @@ mkdir -p %{buildroot}%{_datadir}/man/man1 cp %{_vpath_builddir}/man/*.1 %{buildroot}%{_datadir}/man/man1 # Fix permissions -chmod 644 AUTHORS +chmod 644 AUTHORS LICENSE # also not needed for x86_64 # maybe they fixed it for all archs? @@ -358,6 +358,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Feb 12 2023 Jos de Kloe - 2.28.0-1 +- Upgrade to upstream version 2.28.0 + * Thu Jan 19 2023 Fedora Release Engineering - 2.27.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 4b450ec..e045f02 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (eccodes-2.26.0-Source.tar.gz) = cd4fd2048ad98a4a5c82a0a233b2e64eb67a195d SHA512 (eccodes_test_data_20220526.tar.gz) = 0457878caad6a3395daf60e27cfb72121526065b0cf4da144c7499b8d38bebae0952ddbd20ef0eb53fad77ada60160039340da01001f19fbb7fb1ccbb3d0547a SHA512 (eccodes-2.27.0-Source.tar.gz) = b33d9a4b4abeaa2fae632fe6a4e19071769282c80b7f91f1aaa57f9908386b7c6bd842de69c4bb1b7da2bc3298b5248c808f5c94909033ef5c4a764ae85db5fa SHA512 (eccodes-2.27.1-Source.tar.gz) = 51ba1f53913a6ae7d28f5ffc393a2ac76547be0f88e4b1700601d36863a46135e3164bc36db48d41287aa3e535664d534d0c3ca347eeb6390d6a6ac4df4fd55c +SHA512 (eccodes-2.28.0-Source.tar.gz) = d4fe307c807862f60a1f6629ca009c3eb633a6fb94d5049923bfc3fdd00b091ce233675abd5c33adfc8b61a23473491b4c71f51864584f490674ba93cc20370f From f36befe7e1335a95fa026b853f9621b6c5b69ebd Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 26 Mar 2023 13:46:53 +0200 Subject: [PATCH 54/90] new upstream version 2.29.0 --- .gitignore | 1 + eccodes-soversion.patch | 10 +++++----- eccodes.spec | 17 +++++++---------- sources | 1 + 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 88c4776..14fec01 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /eccodes-2.27.0-Source.tar.gz /eccodes-2.27.1-Source.tar.gz /eccodes-2.28.0-Source.tar.gz +/eccodes-2.29.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 3ed1fa1..6646502 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.28.0-Source.unchanged/fortran/CMakeLists.txt 2023-01-26 15:41:54.000000000 +0100 -+++ eccodes-2.28.0-Source/fortran/CMakeLists.txt 2023-02-12 11:32:34.172600699 +0100 +--- eccodes-2.29.0-Source.unchanged/fortran/CMakeLists.txt 2023-03-14 12:55:29.000000000 +0100 ++++ eccodes-2.29.0-Source/fortran/CMakeLists.txt 2023-03-26 13:20:18.495793176 +0200 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.28.0-Source.unchanged/src/CMakeLists.txt 2023-01-26 15:41:54.000000000 +0100 -+++ eccodes-2.28.0-Source/src/CMakeLists.txt 2023-02-12 11:32:34.190600251 +0100 -@@ -446,6 +446,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.29.0-Source.unchanged/src/CMakeLists.txt 2023-03-14 12:55:29.000000000 +0100 ++++ eccodes-2.29.0-Source/src/CMakeLists.txt 2023-03-26 13:20:18.518792626 +0200 +@@ -438,6 +438,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index 3dc1592..3197b7f 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.28.0 +Version: 2.29.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -52,7 +52,7 @@ Patch1: eccodes-soversion.patch # (and again, unfortunately this issue is not public) BuildRequires: cmake3 -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: /usr/bin/git BuildRequires: jasper-devel @@ -209,12 +209,6 @@ popd # * ENABLE_NETCDF # NetCDF is only needed to create the grib_to_netcdf convert tool # -# * ENABLE_PYTHON has value AUTO as default, so if python2 is available -# during a package build it will build an interface for it. -# To make sure it does not do so, explicitely switch it off. -# Python3 support has been moved to an additional project now, -# so python handling has been removed completely from this spec file. -# #-- Also add an explicit option to not use rpath # # Note: -DINSTALL_LIB_DIR=%%{_lib} is needed because otherwise @@ -236,8 +230,7 @@ popd -DCMAKE_SKIP_INSTALL_RPATH=TRUE \ -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ - -DCMAKE_Fortran_FLAGS="-fPIC" \ - -DENABLE_PYTHON2=OFF + -DCMAKE_Fortran_FLAGS="-fPIC" # note the final '..' is no longer needed to the cmake3 call. # this is now hidden in the %%cmake3 macro @@ -358,6 +351,10 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Mar 26 2023 Jos de Kloe - 2.29.0-1 +- Upgrade to upstream version 2.29.0 + Note that the source code now uses g++ in stead of gcc for compilation. + * Sun Feb 12 2023 Jos de Kloe - 2.28.0-1 - Upgrade to upstream version 2.28.0 diff --git a/sources b/sources index e045f02..b72238a 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (eccodes_test_data_20220526.tar.gz) = 0457878caad6a3395daf60e27cfb7212152 SHA512 (eccodes-2.27.0-Source.tar.gz) = b33d9a4b4abeaa2fae632fe6a4e19071769282c80b7f91f1aaa57f9908386b7c6bd842de69c4bb1b7da2bc3298b5248c808f5c94909033ef5c4a764ae85db5fa SHA512 (eccodes-2.27.1-Source.tar.gz) = 51ba1f53913a6ae7d28f5ffc393a2ac76547be0f88e4b1700601d36863a46135e3164bc36db48d41287aa3e535664d534d0c3ca347eeb6390d6a6ac4df4fd55c SHA512 (eccodes-2.28.0-Source.tar.gz) = d4fe307c807862f60a1f6629ca009c3eb633a6fb94d5049923bfc3fdd00b091ce233675abd5c33adfc8b61a23473491b4c71f51864584f490674ba93cc20370f +SHA512 (eccodes-2.29.0-Source.tar.gz) = 83d7848eb85026081dda9d83e4d63655c81f004a6fb9eabf40b964c4584b984269b960e9ca9bad616bbc3b9ae7c08a758bf85c01b863ed9b371ae0f80eba5993 From 49e412560155c3025e740dd67e5bd8dd8088f667 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 16 Apr 2023 20:02:50 +0200 Subject: [PATCH 55/90] update to upstream version 2.30.0 --- .gitignore | 1 + eccodes.spec | 6 ++++-- sources | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 14fec01..adb9d23 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /eccodes-2.27.1-Source.tar.gz /eccodes-2.28.0-Source.tar.gz /eccodes-2.29.0-Source.tar.gz +/eccodes-2.30.0-Source.tar.gz diff --git a/eccodes.spec b/eccodes.spec index 3197b7f..7e62b3a 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.29.0 +Version: 2.30.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -189,7 +189,6 @@ popd #-- The following features are disabled by default and not switched on: # -# * AEC , support for Adaptive Entropy Coding # * MEMFS , Memory based access to definitions/samples # * MEMORY_MANAGEMENT , enable memory management # * ALIGN_MEMORY , enable memory alignment @@ -351,6 +350,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Apr 16 2023 Jos de Kloe - 2.30.0-1 +- Upgrade to upstream version 2.30.0 + * Sun Mar 26 2023 Jos de Kloe - 2.29.0-1 - Upgrade to upstream version 2.29.0 Note that the source code now uses g++ in stead of gcc for compilation. diff --git a/sources b/sources index b72238a..b8436d4 100644 --- a/sources +++ b/sources @@ -4,3 +4,4 @@ SHA512 (eccodes-2.27.0-Source.tar.gz) = b33d9a4b4abeaa2fae632fe6a4e19071769282c8 SHA512 (eccodes-2.27.1-Source.tar.gz) = 51ba1f53913a6ae7d28f5ffc393a2ac76547be0f88e4b1700601d36863a46135e3164bc36db48d41287aa3e535664d534d0c3ca347eeb6390d6a6ac4df4fd55c SHA512 (eccodes-2.28.0-Source.tar.gz) = d4fe307c807862f60a1f6629ca009c3eb633a6fb94d5049923bfc3fdd00b091ce233675abd5c33adfc8b61a23473491b4c71f51864584f490674ba93cc20370f SHA512 (eccodes-2.29.0-Source.tar.gz) = 83d7848eb85026081dda9d83e4d63655c81f004a6fb9eabf40b964c4584b984269b960e9ca9bad616bbc3b9ae7c08a758bf85c01b863ed9b371ae0f80eba5993 +SHA512 (eccodes-2.30.0-Source.tar.gz) = 07b67cef67cefb32ad4581813ed8814f9394d27846c8bc41b78b1504d296f84547d1fb72ce4813f214fe09b9391449995dd53cf9ae7d27721e2b34353ee58b00 From f4b82949a1171fff58340a7059a1f57092e32341 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 18 May 2023 16:51:08 +0200 Subject: [PATCH 56/90] upgrade to new upstream version 2.30.0, and ensure AEC is enabled, and SPDX license migration. --- .gitignore | 2 + eccodes-soversion.patch | 15 +++--- eccodes.spec | 102 ++++++++++++++++++++++-------------- eccodes_create_man_pages.sh | 28 ++++++++++ sources | 4 +- 5 files changed, 104 insertions(+), 47 deletions(-) create mode 100755 eccodes_create_man_pages.sh diff --git a/.gitignore b/.gitignore index cb5cc65..afa1b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /eccodes_test_data_20200626.tar.gz /eccodes-2.23.0-Source.tar.gz +/eccodes-2.30.0-Source.tar.gz +/eccodes_test_data_20220526.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 78e9b89..6646502 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.23.0-Source.unchanged/fortran/CMakeLists.txt 2021-08-25 11:35:41.000000000 +0200 -+++ eccodes-2.23.0-Source/fortran/CMakeLists.txt 2021-09-01 08:40:58.089840900 +0200 +--- eccodes-2.29.0-Source.unchanged/fortran/CMakeLists.txt 2023-03-14 12:55:29.000000000 +0100 ++++ eccodes-2.29.0-Source/fortran/CMakeLists.txt 2023-03-26 13:20:18.495793176 +0200 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,13 +10,14 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.23.0-Source.unchanged/src/CMakeLists.txt 2021-08-25 11:35:41.000000000 +0200 -+++ eccodes-2.23.0-Source/src/CMakeLists.txt 2021-09-01 08:31:13.559364510 +0200 -@@ -444,6 +444,7 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.29.0-Source.unchanged/src/CMakeLists.txt 2023-03-14 12:55:29.000000000 +0100 ++++ eccodes-2.29.0-Source/src/CMakeLists.txt 2023-03-26 13:20:18.518792626 +0200 +@@ -438,6 +438,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} - TEMPLATES ${grib_api_extra_srcs} -+ SOVERSION ${ECCODES_SOVERSION} + TEMPLATES ${eccodes_extra_src_files} ++ SOVERSION ${ECCODES_SOVERSION} ++ INSTALL_HEADERS_LIST grib_api.h eccodes.h diff --git a/eccodes.spec b/eccodes.spec index dce4f59..fa69ab5 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,14 +1,14 @@ Name: eccodes -Version: 2.23.0 +Version: 2.30.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions %global so_version 0.1 %global so_version_f90 0.1 -%global datapack_date 20200626 +%global datapack_date 20220526 -# latest fedora-35 grib_api version is 1.27.0-12 +# latest fedora-38/rawhide grib_api version is 1.27.0-18 # but this version number is to be updated as soon as we know # what the final release of grib_api by upstream will be. # latest upstream grib_api release is 1.28.0 (05-Dec-2018) @@ -16,44 +16,44 @@ Summary: WMO data format decoding and encoding # (Note that this page is no longer available, 17-Oct-2020) %global final_grib_api_version 1.28.1-1%{?dist} -%ifarch i686 ppc64 s390x armv7hl +%ifarch i686 ppc64 armv7hl %global obsolete_grib_api 0 %else %global obsolete_grib_api 1 %endif # license remarks: -# Most of eccodes is licensed ASL 2.0 but a special case must be noted. +# Most of eccodes is licensed ASL 2.0 (which is identical to the SPDX +# identifier Apache-2.0) but a special case must be noted. # These 2 files: # src/grib_yacc.c # src/grib_yacc.h # contain a special exception clause that allows them to be # relicensed if they are included in a larger project -License: ASL 2.0 +License: Apache-2.0 + +URL: https://confluence.ecmwf.int/display/ECC/ecCodes+Home +Source0: https://confluence.ecmwf.int/download/attachments/45757960/eccodes-%{version}-Source.tar.gz -URL: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home -Source0: https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-%{version}-Source.tar.gz # note: this data package is unversioned upstream but still it is updated # now and then so rename the datapack using the download date # to make it versioned in fedora Source1: http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz#/eccodes_test_data_%{datapack_date}.tar.gz +# a custom script to create man pages +Source2: eccodes_create_man_pages.sh + # Add soversion to the shared libraries, since upstream refuses to do so -# https://software.ecmwf.int/issues/browse/SUP-1809 +# https://jira.ecmwf.int/browse/SUP-1809 Patch1: eccodes-soversion.patch -# Disable versionNumberOfSuperblock checking, since the test expects 0 but -# on Fedora rawhide the code returns a value of 2. -# Issue reported upstream as: https://jira.ecmwf.int/browse/SUP-3497 -Patch2: eccodes-test-grib_to_netcdf.patch - # note that the requests to make the other issues public are filed here: -# https://software.ecmwf.int/issues/browse/SUP-2073 +# https://jira.ecmwf.int/browse/SUP-2073 # (and again, unfortunately this issue is not public) BuildRequires: cmake3 -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: /usr/bin/git BuildRequires: jasper-devel @@ -61,12 +61,16 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: netcdf-devel BuildRequires: openjpeg2-devel +BuildRequires: libaec-devel # For tests BuildRequires: perl(Getopt::Long) BuildRequires: perl(Test::More) BuildRequires: perl(File::Compare) +# For creation of man pages +BuildRequires: help2man + # 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 # installing the base package. It will probably be pretty useless, @@ -102,9 +106,9 @@ ExcludeArch: i686 # but the exclude is still needed for EPEL-7 and EPEL-8 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 @@ -188,24 +192,17 @@ in C, and Fortran 90. %autosetup -n %{name}-%{version}-Source -p1 # unpack the test data below build -mkdir build -cd build +mkdir -p %{_vpath_builddir} +pushd %{_vpath_builddir} tar xf %SOURCE1 - -# remove executable permissions from c files -cd .. -chmod 644 tigge/*.c -chmod 644 tools/*.c - -# remove executable permissions from the authors and license file -chmod 644 AUTHORS LICENSE +popd %build -cd build + +pushd %{_vpath_builddir} #-- The following features are disabled by default and not switched on: # -# * AEC , support for Adaptive Entropy Coding # * MEMFS , Memory based access to definitions/samples # * MEMORY_MANAGEMENT , enable memory management # * ALIGN_MEMORY , enable memory alignment @@ -237,6 +234,11 @@ cd build # the library so files get installed in /usr/lib in stead # of /usr/lib64 on x86_64. +# added -DCMAKE_Fortran_FLAGS="-fPIC" +# because the koji build crashes with the error that it needs this setting +# when I try to build for armv7hl (other archs do not complain ......) +# I have no idea what causes this difference in behaviour. + %cmake3 -DINSTALL_LIB_DIR=%{_lib} \ -DENABLE_ECCODES_OMP_THREADS=ON \ -DENABLE_EXTRA_TESTS=ON \ @@ -249,18 +251,20 @@ cd build -DECCODES_SOVERSION_F90=%{so_version_f90} \ -DCMAKE_Fortran_FLAGS="-fPIC" \ -DENABLE_PYTHON2=OFF \ + -DENABLE_AEC=ON \ .. %make_build +popd + # copy some include files to the build dir -# that are otherwise not found when creating the debugsource subpackage -cd .. -cp fortran/eccodes_constants.h build/fortran/ -cp fortran/grib_api_constants.h build/fortran/ +# that are otherwise not found when creating the debugsource sub-package +cp fortran/eccodes_constants.h %{_vpath_builddir}/fortran/ +cp fortran/grib_api_constants.h %{_vpath_builddir}/fortran/ %install -%make_install -C build +%make_install -C %{_vpath_builddir} mkdir -p %{buildroot}%{_fmoddir} mv %{buildroot}%{_includedir}/*.mod %{buildroot}%{_fmoddir}/ @@ -273,8 +277,6 @@ rm %{buildroot}%{_datadir}/%{name}/definitions/installDefinitions.sh # copy the html documentation to the install directory mkdir -p %{buildroot}%{_datadir}/doc/%{name}/ cp -r html %{buildroot}%{_datadir}/doc/%{name}/ -# and remove an unneeded Makefile from the html directory -rm %{buildroot}%{_datadir}/doc/%{name}/html/Makefile.am # copy the example scripts/programs to the install directory # but dont copy the shell scripts and Makefiles, since these @@ -288,6 +290,21 @@ cp examples/C/*.c %{buildroot}%{_datadir}/doc/%{name}/examples/C mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/F90 cp examples/F90/*.f90 %{buildroot}%{_datadir}/doc/%{name}/examples/F90 +# create man pages for the tools that support the --help option +# since upstream does not provide them. +# Source2 points to the script eccodes_create_man_pages.sh +# used to generate the man pages. +LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \ +%{SOURCE2} %{_vpath_builddir}/bin \ + %{_vpath_builddir}/man + +# copy the created man pages to the install directory +mkdir -p %{buildroot}%{_datadir}/man/man1 +cp %{_vpath_builddir}/man/*.1 %{buildroot}%{_datadir}/man/man1 + +# Fix permissions +chmod 644 AUTHORS LICENSE + # also not needed for x86_64 # maybe they fixed it for all archs? #%%ifarch i686 armv7hl @@ -311,7 +328,7 @@ sed -i 's|^libs=.*$|libs=-L${libdir} -leccodes_f90 -leccodes|g' %{buildroot}/%{_ %ldconfig_scriptlets %check -cd build +cd %{_vpath_builddir} # notes: # * the LD_LIBRARY_PATH setting is required to let the tests @@ -333,6 +350,7 @@ ctest3 -V %{?_smp_mflags} %doc README.md ChangeLog AUTHORS NEWS NOTICE %{_bindir}/* %{_libdir}/*.so.* +%{_mandir}/man1/*.1* %files devel %{_includedir}/* @@ -354,6 +372,14 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu May 18 2023 Jos de Kloe - 2.30.0-1 +- Upgrade to upstream version 2.30.0 +- explicitly switch on ENABLE_AEC +- migrated to SPDX license + +* Wed Jun 1 2022 Jos de Kloe - 2.26.0-1 +- Upgrade to upstream version 2.26.0 + * Mon Oct 11 2021 Jos de Kloe - 2.23.0-1 - Upgrade to upstream version 2.23.0 diff --git a/eccodes_create_man_pages.sh b/eccodes_create_man_pages.sh new file mode 100755 index 0000000..6ca4bfe --- /dev/null +++ b/eccodes_create_man_pages.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +# a simple script to create man pages for tools +# provided in the bin dir after installation of eccodes. +# +# Written by: J. de Kloe, 2022. + +BINDIR=$1 +DESTDIR=$2 + +if [ ! -e "$DESTDIR" ] ; then + mkdir -p "$DESTDIR" +fi + +for TOOL in "$BINDIR"/* +do + BASENAME=$(basename "$TOOL") + help2man --no-info --output="${DESTDIR}/${BASENAME}.1" "${TOOL}" +done + +# currently (29-Aug-2022) help2man fails on these 5 tools: +# help2man: can't get `--help' info from ../bin/bufr_count +# help2man: can't get `--help' info from ../bin/codes_count +# help2man: can't get `--help' info from ../bin/grib2ppm +# help2man: can't get `--help' info from ../bin/grib_count +# help2man: can't get `--help' info from ../bin/gts_count + +echo "done" diff --git a/sources b/sources index 30a5938..83a0a88 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e -SHA512 (eccodes-2.23.0-Source.tar.gz) = df8e9f25396d91ae0adb1b1502cdb6c1473d80caf79ce3fe9318ecc63194fd1c7dc7424fccf44aabf8c06ea343d59093bb21e75f6e5466f21ce44cb514e07350 +SHA512 (eccodes_test_data_20220526.tar.gz) = 0457878caad6a3395daf60e27cfb72121526065b0cf4da144c7499b8d38bebae0952ddbd20ef0eb53fad77ada60160039340da01001f19fbb7fb1ccbb3d0547a +SHA512 (eccodes-2.30.0-Source.tar.gz) = 07b67cef67cefb32ad4581813ed8814f9394d27846c8bc41b78b1504d296f84547d1fb72ce4813f214fe09b9391449995dd53cf9ae7d27721e2b34353ee58b00 From b8a25a59b578be6096956c76c5cd0ed20b422df9 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 18 May 2023 17:17:17 +0200 Subject: [PATCH 57/90] updated readme and rpmlintrc --- README.md | 15 +++++++++++ eccodes.rpmlintrc | 63 ++++++++--------------------------------------- 2 files changed, 25 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 035f9e0..f4658ba 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,18 @@ messages in the following formats: For further details see: https://confluence.ecmwf.int/display/ECC/What+is+ecCodes + +Note for end users: +epel policy is to keep software versions stable for a given epel version +unless there is a strong reason why an update is needed +(for example security issues or malfunction). + +Since eccodes depends on a large collection of table definitions +that are included in the package, after some time these tables +(holding the WMO file format definitions for GRIB and BUFR files, +which are updated every 6 months) will become outdated, and new files +using these formats can not be used. + +If this is a problem for you, please raise the issue in bugzilla. +Since this is a malfunction from user perspective this is a +reason to update the package. diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc index 60064d2..b6c8fb4 100644 --- a/eccodes.rpmlintrc +++ b/eccodes.rpmlintrc @@ -1,56 +1,13 @@ -# use like this: -# rpmlint --file eccodes.rpmlintrc *.rpm -# example: addFilter ("^foo-.*regex-match-for-rpmlint-warning") -# these are invalid spelling warnings. GRIB and BUFR are correct, since these are -# the names of the data files that this software handles. -# the description itself is a 1-to-1 copy of what the (UK-based) upstream -# writes, and I am not going to translate this to US spelling ... -addFilter ("W: spelling-error %description -l en_US behaviour -> behavior") -addFilter ("W: spelling-error %description -l en_US grib ->") -addFilter ("W: spelling-error %description -l en_US bufr ->") +# Disable warning on duplicate files. +# This package uses a huge number (1990 cases at the time of wrinting) +# duplicates in the tables definitions, and patching this is totally +# out of scope for my limited time. +addFilter(r" W: files-duplicate ") +addFilter(r" E: files-duplicated-waste ") -# this data file with wrong line ending has been added to the software on purpose -# for testing purposes, so this is no mistake -addFilter ("eccodes-doc.noarch: W: wrong-file-end-of-line-encoding /usr/share/doc/eccodes/examples/python/flight_data.csv") +# Disable warnings on missing man pages. +# The tools that have --help output have been fixed by using help2man. +# The remaining ones have no help output whatsoever and are not easy to fix. +addFilter(r" W: no-manual-page-for-binary ") -# these data files are no scripts. The dataformat just has an unfortunate first line -# starting with #! so it resembles a shebang line. -# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.0.def") -addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.0.def") -addFilter ("^eccodes-data.noarch: E: wrong-script-interpreter /usr/share/eccodes/definitions/grib1/local.82.83.def") -addFilter ("^eccodes-data.noarch: E: non-executable-script /usr/share/eccodes/definitions/grib1/local.82.83.def") - -# this is a false error (its an rpmlint bug). -# the spec file now uses %ldconfig_scriptlets in stead of the old ldconfig-postin/postun -# see also comment #18 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes.so.0.1") -addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes.so.0.1") -addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postin /usr/lib64/libeccodes_f90.so.0.1") -addFilter ("^eccodes.x86_64: E: library-without-ldconfig-postun /usr/lib64/libeccodes_f90.so.0.1") - -# this is an rpmlint bug -# see also comment #8 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("eccodes-debuginfo.x86_64: E: useless-provides debuginfo\(build-id\)") - -# there is no full compatibility between the old grib_api and the new eccodes -# so only obsoletes can be used bu no provides. -# see also comment #21 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("^eccodes.x86_64: W: obsolete-not-provided grib_api") -addFilter ("^eccodes-devel.x86_64: W: obsolete-not-provided grib_api-devel") -addFilter ("^eccodes-devel.x86_64: W: only-non-binary-in-usr-lib") - -# documentation is in a dedicated doc subpackage, -# so these warnings have no merit -addFilter ("python2-eccodes.x86_64: W: no-documentation") -addFilter ("eccodes-debugsource.x86_64: W: no-documentation") -addFilter ("eccodes-devel.x86_64: W: no-documentation") -addFilter ("eccodes-data.noarch: W: no-documentation") - -# temporary disable the man page warning, since it obscures other problems that -# may be more important, and it has already been reported upstream -# see also comment #3 in the review request at https://bugzilla.redhat.com/show_bug.cgi?id=1508950 -addFilter ("eccodes.x86_64: W: no-manual-page-for-binary") - -# addFilter ("") From 0f7b84f6619d1f6e8e23e4830cccbc449aa8ade4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 18:11:12 +0000 Subject: [PATCH 58/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 7e62b3a..2c2daea 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.30.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -350,6 +350,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 2.30.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Apr 16 2023 Jos de Kloe - 2.30.0-1 - Upgrade to upstream version 2.30.0 From 921dbf79c3d0ba2ca1b2a0601e8479d49046927b Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 27 Jul 2023 17:20:21 +0200 Subject: [PATCH 59/90] update to upstream version 2.31.0 --- eccodes-soversion.patch | 10 +++++----- eccodes.spec | 10 +++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 6646502..0fe79eb 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.29.0-Source.unchanged/fortran/CMakeLists.txt 2023-03-14 12:55:29.000000000 +0100 -+++ eccodes-2.29.0-Source/fortran/CMakeLists.txt 2023-03-26 13:20:18.495793176 +0200 +--- eccodes-2.31.0-Source.unchanged/fortran/CMakeLists.txt 2023-07-11 12:23:31.000000000 +0200 ++++ eccodes-2.31.0-Source/fortran/CMakeLists.txt 2023-07-27 16:51:03.866574555 +0200 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.29.0-Source.unchanged/src/CMakeLists.txt 2023-03-14 12:55:29.000000000 +0100 -+++ eccodes-2.29.0-Source/src/CMakeLists.txt 2023-03-26 13:20:18.518792626 +0200 -@@ -438,6 +438,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.31.0-Source.unchanged/src/CMakeLists.txt 2023-07-11 12:23:31.000000000 +0200 ++++ eccodes-2.31.0-Source/src/CMakeLists.txt 2023-07-27 16:51:03.887574092 +0200 +@@ -427,6 +427,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index 2c2daea..2922ccd 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes -Version: 2.30.0 -Release: 2%{?dist} +Version: 2.31.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -23,7 +23,8 @@ Summary: WMO data format decoding and encoding %endif # license remarks: -# Most of eccodes is licensed ASL 2.0 but a special case must be noted. +# Most of eccodes is licensed ASL 2.0 (which is identical to the SPDX +# identifier Apache-2.0) but a special case must be noted. # These 2 files: # src/grib_yacc.c # src/grib_yacc.h @@ -350,6 +351,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu Jul 27 2023 Jos de Kloe - 2.31.0-1 +- Upgrade to upstream version 2.31.0 + * Wed Jul 19 2023 Fedora Release Engineering - 2.30.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1b7a8f02c9c0bb64352791251a6a22889419f6cf Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 27 Jul 2023 17:22:01 +0200 Subject: [PATCH 60/90] new source code version --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index adb9d23..11b2cc3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /eccodes-2.28.0-Source.tar.gz /eccodes-2.29.0-Source.tar.gz /eccodes-2.30.0-Source.tar.gz +/eccodes-2.31.0-Source.tar.gz diff --git a/sources b/sources index b8436d4..b09e197 100644 --- a/sources +++ b/sources @@ -5,3 +5,4 @@ SHA512 (eccodes-2.27.1-Source.tar.gz) = 51ba1f53913a6ae7d28f5ffc393a2ac76547be0f SHA512 (eccodes-2.28.0-Source.tar.gz) = d4fe307c807862f60a1f6629ca009c3eb633a6fb94d5049923bfc3fdd00b091ce233675abd5c33adfc8b61a23473491b4c71f51864584f490674ba93cc20370f SHA512 (eccodes-2.29.0-Source.tar.gz) = 83d7848eb85026081dda9d83e4d63655c81f004a6fb9eabf40b964c4584b984269b960e9ca9bad616bbc3b9ae7c08a758bf85c01b863ed9b371ae0f80eba5993 SHA512 (eccodes-2.30.0-Source.tar.gz) = 07b67cef67cefb32ad4581813ed8814f9394d27846c8bc41b78b1504d296f84547d1fb72ce4813f214fe09b9391449995dd53cf9ae7d27721e2b34353ee58b00 +SHA512 (eccodes-2.31.0-Source.tar.gz) = f3fe70ad0a765ae6e9d23b1b0c6ac96ad81a8324b15b7ebbcc958ffa1a046079d4a9953d720a8c15ac421897059a74c96ea678254f59c88538e3dd4970da131c From e8986e121e05bfed24eb62802fbc3f260a4f629c Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 2 Nov 2023 08:54:41 +0100 Subject: [PATCH 61/90] Upgrade to upstream version 2.32.1 and add updated test_data package --- .gitignore | 2 ++ eccodes-soversion.patch | 10 +++++----- eccodes.spec | 11 +++++++++-- sources | 2 ++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 11b2cc3..d9d0b74 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /eccodes-2.29.0-Source.tar.gz /eccodes-2.30.0-Source.tar.gz /eccodes-2.31.0-Source.tar.gz +/eccodes-2.32.1-Source.tar.gz +/eccodes_test_data_20231101.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 0fe79eb..03b520c 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.31.0-Source.unchanged/fortran/CMakeLists.txt 2023-07-11 12:23:31.000000000 +0200 -+++ eccodes-2.31.0-Source/fortran/CMakeLists.txt 2023-07-27 16:51:03.866574555 +0200 +--- eccodes-2.32.1-Source.unchanged/fortran/CMakeLists.txt 2023-10-26 17:16:35.000000000 +0200 ++++ eccodes-2.32.1-Source/fortran/CMakeLists.txt 2023-10-29 15:39:34.397319711 +0100 @@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.31.0-Source.unchanged/src/CMakeLists.txt 2023-07-11 12:23:31.000000000 +0200 -+++ eccodes-2.31.0-Source/src/CMakeLists.txt 2023-07-27 16:51:03.887574092 +0200 -@@ -427,6 +427,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.32.1-Source.unchanged/src/CMakeLists.txt 2023-10-26 17:16:35.000000000 +0200 ++++ eccodes-2.32.1-Source/src/CMakeLists.txt 2023-10-29 15:39:34.397319711 +0100 +@@ -411,6 +411,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index 2922ccd..c77b1bb 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,12 +1,16 @@ Name: eccodes -Version: 2.31.0 +Version: 2.32.1 Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions %global so_version 0.1 %global so_version_f90 0.1 -%global datapack_date 20220526 + +# note that the test_data package provided on the ECMWF version +# is unversioned, so use the download date to discriminate +# between different versions. +%global datapack_date 20231101 # latest fedora-38/rawhide grib_api version is 1.27.0-18 # but this version number is to be updated as soon as we know @@ -351,6 +355,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu Nov 02 2023 Jos de Kloe - 2.32.1-1 +- Upgrade to upstream version 2.32.1 and add updated test_data package + * Thu Jul 27 2023 Jos de Kloe - 2.31.0-1 - Upgrade to upstream version 2.31.0 diff --git a/sources b/sources index b09e197..28e346c 100644 --- a/sources +++ b/sources @@ -6,3 +6,5 @@ SHA512 (eccodes-2.28.0-Source.tar.gz) = d4fe307c807862f60a1f6629ca009c3eb633a6fb SHA512 (eccodes-2.29.0-Source.tar.gz) = 83d7848eb85026081dda9d83e4d63655c81f004a6fb9eabf40b964c4584b984269b960e9ca9bad616bbc3b9ae7c08a758bf85c01b863ed9b371ae0f80eba5993 SHA512 (eccodes-2.30.0-Source.tar.gz) = 07b67cef67cefb32ad4581813ed8814f9394d27846c8bc41b78b1504d296f84547d1fb72ce4813f214fe09b9391449995dd53cf9ae7d27721e2b34353ee58b00 SHA512 (eccodes-2.31.0-Source.tar.gz) = f3fe70ad0a765ae6e9d23b1b0c6ac96ad81a8324b15b7ebbcc958ffa1a046079d4a9953d720a8c15ac421897059a74c96ea678254f59c88538e3dd4970da131c +SHA512 (eccodes-2.32.1-Source.tar.gz) = 7fdb34cee0b656ebbecc04d654642b0524eb6e772c1d811471061698f4ec2d31da3be3d66ee697dd3e106f3e8024058b4c165c6dad59868af66a38949c956c77 +SHA512 (eccodes_test_data_20231101.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e From ec997229b9b0077a9476f42688d18055d801f03a Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 26 Nov 2023 11:36:57 +0100 Subject: [PATCH 62/90] rebuild after so name jump of libjasper --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index c77b1bb..4c85f80 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,6 @@ Name: eccodes Version: 2.32.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -355,6 +355,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Nov 26 2023 Jos de Kloe - 2.32.1-1 +- rebuild after so name jump of libjasper + * Thu Nov 02 2023 Jos de Kloe - 2.32.1-1 - Upgrade to upstream version 2.32.1 and add updated test_data package From 898051186fd2e3baf0ae02b4f0adaa22236a35fd Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 26 Nov 2023 11:54:46 +0100 Subject: [PATCH 63/90] fix typo in change log --- eccodes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 4c85f80..369dfa9 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -355,7 +355,7 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog -* Sun Nov 26 2023 Jos de Kloe - 2.32.1-1 +* Sun Nov 26 2023 Jos de Kloe - 2.32.1-2 - rebuild after so name jump of libjasper * Thu Nov 02 2023 Jos de Kloe - 2.32.1-1 From fa6f919939a62336ddfc46aae5b3bb76e9f8f032 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 26 Nov 2023 11:56:33 +0100 Subject: [PATCH 64/90] remove outdated rpmlintrc file --- eccodes.rpmlintrc | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 eccodes.rpmlintrc diff --git a/eccodes.rpmlintrc b/eccodes.rpmlintrc deleted file mode 100644 index b6c8fb4..0000000 --- a/eccodes.rpmlintrc +++ /dev/null @@ -1,13 +0,0 @@ - -# Disable warning on duplicate files. -# This package uses a huge number (1990 cases at the time of wrinting) -# duplicates in the tables definitions, and patching this is totally -# out of scope for my limited time. -addFilter(r" W: files-duplicate ") -addFilter(r" E: files-duplicated-waste ") - -# Disable warnings on missing man pages. -# The tools that have --help output have been fixed by using help2man. -# The remaining ones have no help output whatsoever and are not easy to fix. -addFilter(r" W: no-manual-page-for-binary ") - From c31f1653f7164c53c0370d6c125113535def6ac6 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 16 Dec 2023 19:33:29 -0700 Subject: [PATCH 65/90] Update to 2.33.0 --- .gitignore | 2 ++ eccodes.spec | 17 +++++++++++------ sources | 12 ++---------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index d9d0b74..d311f8a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /eccodes-2.31.0-Source.tar.gz /eccodes-2.32.1-Source.tar.gz /eccodes_test_data_20231101.tar.gz +/eccodes-2.33.0-Source.tar.gz +/eccodes_test_data_20231216.tar.gz diff --git a/eccodes.spec b/eccodes.spec index 369dfa9..95e9004 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,6 +1,10 @@ +%if 0%{?el8} +%undefine __cmake_in_source_build +%endif + Name: eccodes -Version: 2.32.1 -Release: 2%{?dist} +Version: 2.33.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -10,7 +14,7 @@ Summary: WMO data format decoding and encoding # note that the test_data package provided on the ECMWF version # is unversioned, so use the download date to discriminate # between different versions. -%global datapack_date 20231101 +%global datapack_date 20231216 # latest fedora-38/rawhide grib_api version is 1.27.0-18 # but this version number is to be updated as soon as we know @@ -43,7 +47,7 @@ Source0: https://confluence.ecmwf.int/download/attachments/45757960/eccod # note: this data package is unversioned upstream but still it is updated # now and then so rename the datapack using the download date # to make it versioned in fedora -Source1: http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz#/eccodes_test_data_%{datapack_date}.tar.gz +Source1: https://get.ecmwf.int/repository/test-data/eccodes/eccodes_test_data.tar.gz#/eccodes_test_data_%{datapack_date}.tar.gz # a custom script to create man pages Source2: eccodes_create_man_pages.sh @@ -105,8 +109,6 @@ Obsoletes: grib_api < %{final_grib_api_version} # as explained in bugzilla #1562066 ExcludeArch: i686 -# as explained in bugzilla #1562084 -ExcludeArch: armv7hl %description ecCodes is a package developed by ECMWF which provides an application @@ -355,6 +357,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Dec 17 2023 Orion Poplawski - 2.33.0-1 +- Update to 2.33.0 + * Sun Nov 26 2023 Jos de Kloe - 2.32.1-2 - rebuild after so name jump of libjasper diff --git a/sources b/sources index 28e346c..e1bf13e 100644 --- a/sources +++ b/sources @@ -1,10 +1,2 @@ -SHA512 (eccodes-2.26.0-Source.tar.gz) = cd4fd2048ad98a4a5c82a0a233b2e64eb67a195d42637607423669351b6cd295b111a382f6d9ecb05ffe25f79599bf3963550ca27d84e7f9ef55e499e183a35f -SHA512 (eccodes_test_data_20220526.tar.gz) = 0457878caad6a3395daf60e27cfb72121526065b0cf4da144c7499b8d38bebae0952ddbd20ef0eb53fad77ada60160039340da01001f19fbb7fb1ccbb3d0547a -SHA512 (eccodes-2.27.0-Source.tar.gz) = b33d9a4b4abeaa2fae632fe6a4e19071769282c80b7f91f1aaa57f9908386b7c6bd842de69c4bb1b7da2bc3298b5248c808f5c94909033ef5c4a764ae85db5fa -SHA512 (eccodes-2.27.1-Source.tar.gz) = 51ba1f53913a6ae7d28f5ffc393a2ac76547be0f88e4b1700601d36863a46135e3164bc36db48d41287aa3e535664d534d0c3ca347eeb6390d6a6ac4df4fd55c -SHA512 (eccodes-2.28.0-Source.tar.gz) = d4fe307c807862f60a1f6629ca009c3eb633a6fb94d5049923bfc3fdd00b091ce233675abd5c33adfc8b61a23473491b4c71f51864584f490674ba93cc20370f -SHA512 (eccodes-2.29.0-Source.tar.gz) = 83d7848eb85026081dda9d83e4d63655c81f004a6fb9eabf40b964c4584b984269b960e9ca9bad616bbc3b9ae7c08a758bf85c01b863ed9b371ae0f80eba5993 -SHA512 (eccodes-2.30.0-Source.tar.gz) = 07b67cef67cefb32ad4581813ed8814f9394d27846c8bc41b78b1504d296f84547d1fb72ce4813f214fe09b9391449995dd53cf9ae7d27721e2b34353ee58b00 -SHA512 (eccodes-2.31.0-Source.tar.gz) = f3fe70ad0a765ae6e9d23b1b0c6ac96ad81a8324b15b7ebbcc958ffa1a046079d4a9953d720a8c15ac421897059a74c96ea678254f59c88538e3dd4970da131c -SHA512 (eccodes-2.32.1-Source.tar.gz) = 7fdb34cee0b656ebbecc04d654642b0524eb6e772c1d811471061698f4ec2d31da3be3d66ee697dd3e106f3e8024058b4c165c6dad59868af66a38949c956c77 -SHA512 (eccodes_test_data_20231101.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e +SHA512 (eccodes-2.33.0-Source.tar.gz) = 4afc2a9e59da54093eb318a1447904faac7371df980a57ce21e04ef98d1d7e02f10ef363a497d29f086b1f17a86ba4e46bf14898cd227eae8bbe0297c62b4183 +SHA512 (eccodes_test_data_20231216.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e From 881aa24c91a078c213aa2980733cdf30500b19c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:49:19 +0000 Subject: [PATCH 66/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 95e9004..fdc29af 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.33.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -357,6 +357,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 2.33.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Dec 17 2023 Orion Poplawski - 2.33.0-1 - Update to 2.33.0 From c076718b3673853d76292af96a7acfc084e35e35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:05:58 +0000 Subject: [PATCH 67/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index fdc29af..bf60616 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.33.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -357,6 +357,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 2.33.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 2.33.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7f14f9a166a4fcdb7a5654cf549baa88795cda38 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Tue, 27 Feb 2024 09:10:19 +0100 Subject: [PATCH 68/90] update to v2.34.1 --- eccodes-soversion.patch | 12 ++++++------ eccodes.spec | 14 +++++++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 03b520c..f65290a 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,6 +1,6 @@ ---- eccodes-2.32.1-Source.unchanged/fortran/CMakeLists.txt 2023-10-26 17:16:35.000000000 +0200 -+++ eccodes-2.32.1-Source/fortran/CMakeLists.txt 2023-10-29 15:39:34.397319711 +0100 -@@ -49,7 +49,8 @@ if( HAVE_FORTRAN ) +--- eccodes-2.34.0-Source.unchanged/fortran/CMakeLists.txt 2024-02-07 13:02:35.000000000 +0100 ++++ eccodes-2.34.0-Source/fortran/CMakeLists.txt 2024-02-17 17:13:47.249840264 +0100 +@@ -46,7 +46,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.32.1-Source.unchanged/src/CMakeLists.txt 2023-10-26 17:16:35.000000000 +0200 -+++ eccodes-2.32.1-Source/src/CMakeLists.txt 2023-10-29 15:39:34.397319711 +0100 -@@ -411,6 +411,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.34.0-Source.unchanged/src/CMakeLists.txt 2024-02-07 13:02:35.000000000 +0100 ++++ eccodes-2.34.0-Source/src/CMakeLists.txt 2024-02-17 17:13:47.272839720 +0100 +@@ -415,6 +415,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index bf60616..c1ab8d3 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,10 +3,15 @@ %endif Name: eccodes -Version: 2.33.0 -Release: 3%{?dist} +Version: 2.34.1 +Release: 1%{?dist} Summary: WMO data format decoding and encoding +# NOTE: dont use version 2.34.0 +# This has some code issues when compiled with the g++ flag "-flto=auto" +# (which is default at the moment) and this makes the library and tools +# unusable. + # force the shared libraries to have these so versions %global so_version 0.1 %global so_version_f90 0.1 @@ -14,7 +19,7 @@ Summary: WMO data format decoding and encoding # note that the test_data package provided on the ECMWF version # is unversioned, so use the download date to discriminate # between different versions. -%global datapack_date 20231216 +%global datapack_date 20240217 # latest fedora-38/rawhide grib_api version is 1.27.0-18 # but this version number is to be updated as soon as we know @@ -357,6 +362,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Tue Feb 27 2024 Jos de Kloe - 2.34.1-1 +- Update to 2.34.1 + * Wed Jan 24 2024 Fedora Release Engineering - 2.33.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6b38306b8a947681fb066c993bd175887fa4ca6c Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Wed, 28 Feb 2024 08:19:48 +0100 Subject: [PATCH 69/90] now add the new sources as well --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d311f8a..3088a02 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /eccodes_test_data_20231101.tar.gz /eccodes-2.33.0-Source.tar.gz /eccodes_test_data_20231216.tar.gz +/eccodes-2.34.1-Source.tar.gz diff --git a/sources b/sources index e1bf13e..5a17873 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (eccodes-2.33.0-Source.tar.gz) = 4afc2a9e59da54093eb318a1447904faac7371df980a57ce21e04ef98d1d7e02f10ef363a497d29f086b1f17a86ba4e46bf14898cd227eae8bbe0297c62b4183 SHA512 (eccodes_test_data_20231216.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e +SHA512 (eccodes-2.34.1-Source.tar.gz) = 3757f051fd80dd381c6687c404c835c6a890341052ded3b72a6802dde5d2d8fd83be4a8d6ec3d19592ca0c5f4211c46f1ba125ba0ef0be9cc45cac6bd3d37c1e From 3fec8b43b72a776cf9527214da2ce00a5b42a500 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Thu, 29 Feb 2024 08:33:05 +0100 Subject: [PATCH 70/90] new test data package --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3088a02..a148e38 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /eccodes-2.33.0-Source.tar.gz /eccodes_test_data_20231216.tar.gz /eccodes-2.34.1-Source.tar.gz +/eccodes_test_data_20240217.tar.gz diff --git a/sources b/sources index 5a17873..47aca94 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (eccodes-2.33.0-Source.tar.gz) = 4afc2a9e59da54093eb318a1447904faac7371df980a57ce21e04ef98d1d7e02f10ef363a497d29f086b1f17a86ba4e46bf14898cd227eae8bbe0297c62b4183 SHA512 (eccodes_test_data_20231216.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e SHA512 (eccodes-2.34.1-Source.tar.gz) = 3757f051fd80dd381c6687c404c835c6a890341052ded3b72a6802dde5d2d8fd83be4a8d6ec3d19592ca0c5f4211c46f1ba125ba0ef0be9cc45cac6bd3d37c1e +SHA512 (eccodes_test_data_20240217.tar.gz) = c495a71f18ea01aa480b0920fbfce8d370574d412c95eb04823d0d4544fed0e2dba8e98d63e2be0a3c33a127840e7262d391373fab9304a773e9764457ade5a7 From 731cd8d67cd3ef1029a3e69a40ca525bd3d6a698 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 4 May 2024 16:43:50 +0200 Subject: [PATCH 71/90] update to upstream version 2.35.0 --- .gitignore | 1 + eccodes-soversion.patch | 10 +++++----- eccodes.spec | 15 ++++++++++----- sources | 1 + 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a148e38..bd3f89d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /eccodes_test_data_20231216.tar.gz /eccodes-2.34.1-Source.tar.gz /eccodes_test_data_20240217.tar.gz +/eccodes-2.35.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index f65290a..5a3e406 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.34.0-Source.unchanged/fortran/CMakeLists.txt 2024-02-07 13:02:35.000000000 +0100 -+++ eccodes-2.34.0-Source/fortran/CMakeLists.txt 2024-02-17 17:13:47.249840264 +0100 +--- eccodes-2.35.0-Source.unchanged/fortran/CMakeLists.txt 2024-04-11 12:13:21.000000000 +0200 ++++ eccodes-2.35.0-Source/fortran/CMakeLists.txt 2024-05-04 16:18:42.732436699 +0200 @@ -46,7 +46,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.34.0-Source.unchanged/src/CMakeLists.txt 2024-02-07 13:02:35.000000000 +0100 -+++ eccodes-2.34.0-Source/src/CMakeLists.txt 2024-02-17 17:13:47.272839720 +0100 -@@ -415,6 +415,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.35.0-Source.unchanged/src/CMakeLists.txt 2024-04-11 12:13:21.000000000 +0200 ++++ eccodes-2.35.0-Source/src/CMakeLists.txt 2024-05-04 16:18:42.733436675 +0200 +@@ -416,6 +416,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index c1ab8d3..883fcbd 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,7 +3,7 @@ %endif Name: eccodes -Version: 2.34.1 +Version: 2.35.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -70,10 +70,9 @@ BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: /usr/bin/git BuildRequires: jasper-devel -BuildRequires: libjpeg-devel +BuildRequires: openjpeg2-devel >= 2.5.2 BuildRequires: libpng-devel BuildRequires: netcdf-devel -BuildRequires: openjpeg2-devel BuildRequires: libaec-devel # For tests @@ -84,8 +83,8 @@ BuildRequires: perl(File::Compare) # For creation of man pages BuildRequires: help2man -# 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 +# 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 # installing the base package. It will probably be pretty useless, # unless a user wishes to read and study all these grib and bufr # file format definitions. @@ -362,6 +361,12 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sat May 04 2024 Jos de Kloe - 2.35.0-1 +- Update to 2.35.0 + +* Mon Mar 04 2024 Jos de Kloe - 2.34.1-2 +- Require openjpeg2-devel >= 2.5.2 (needed to build for f40) + * Tue Feb 27 2024 Jos de Kloe - 2.34.1-1 - Update to 2.34.1 diff --git a/sources b/sources index 47aca94..916a08e 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (eccodes-2.33.0-Source.tar.gz) = 4afc2a9e59da54093eb318a1447904faac7371df SHA512 (eccodes_test_data_20231216.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e SHA512 (eccodes-2.34.1-Source.tar.gz) = 3757f051fd80dd381c6687c404c835c6a890341052ded3b72a6802dde5d2d8fd83be4a8d6ec3d19592ca0c5f4211c46f1ba125ba0ef0be9cc45cac6bd3d37c1e SHA512 (eccodes_test_data_20240217.tar.gz) = c495a71f18ea01aa480b0920fbfce8d370574d412c95eb04823d0d4544fed0e2dba8e98d63e2be0a3c33a127840e7262d391373fab9304a773e9764457ade5a7 +SHA512 (eccodes-2.35.0-Source.tar.gz) = 0828b33aa0a9dda1db8bbd683eeccf49a0c2df5cdc79e34684981bb59d47dd913552460d7b64bfed05d568f30a7210a1091c9431fa21378ef6fb187829fd65a9 From 4274a9c135dfb6c2132768dff5355698ca060f46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:41:05 +0000 Subject: [PATCH 72/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 883fcbd..96f6c13 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.35.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # NOTE: dont use version 2.34.0 @@ -361,6 +361,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 2.35.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat May 04 2024 Jos de Kloe - 2.35.0-1 - Update to 2.35.0 From 9b4ce377a80f9af2526af4a8a36323c8c2055caa Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Wed, 24 Jul 2024 08:23:50 +0200 Subject: [PATCH 73/90] update to version 2.36.0 --- .gitignore | 1 + eccodes-thread-init-fix.patch | 47 +++++++++++++++++++++++++++++++++++ eccodes.spec | 14 +++++++++-- sources | 1 + 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 eccodes-thread-init-fix.patch diff --git a/.gitignore b/.gitignore index bd3f89d..83ac1ff 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /eccodes-2.34.1-Source.tar.gz /eccodes_test_data_20240217.tar.gz /eccodes-2.35.0-Source.tar.gz +/eccodes-2.36.0-Source.tar.gz diff --git a/eccodes-thread-init-fix.patch b/eccodes-thread-init-fix.patch new file mode 100644 index 0000000..0f28ec9 --- /dev/null +++ b/eccodes-thread-init-fix.patch @@ -0,0 +1,47 @@ +--- eccodes-2.36.0-Source.unchanged/src/accessor/grib_accessor_class_bufr_elements_table.cc 2024-06-24 12:52:58.000000000 +0200 ++++ eccodes-2.36.0-Source/src/accessor/grib_accessor_class_bufr_elements_table.cc 2024-07-23 19:38:30.211681092 +0200 +@@ -1,4 +1,3 @@ +- + /* + * (C) Copyright 2005- ECMWF. + * +@@ -28,7 +27,7 @@ static void thread_init() + static int once = 0; + static omp_nest_lock_t mutex1; + +-void thread_init() ++static void thread_init() + { + GRIB_OMP_CRITICAL(lock_grib_accessor_class_bufr_elements_table_c) + { +--- eccodes-2.36.0-Source.unchanged/src/accessor/grib_accessor_class_codetable.cc 2024-06-24 12:52:58.000000000 +0200 ++++ eccodes-2.36.0-Source/src/accessor/grib_accessor_class_codetable.cc 2024-07-23 19:38:30.248680436 +0200 +@@ -20,7 +20,7 @@ grib_accessor_class* grib_accessor_class + static pthread_once_t once = PTHREAD_ONCE_INIT; + static pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER; + +-void thread_init() ++static void thread_init() + { + pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); +@@ -32,7 +32,7 @@ void thread_init() + static int once = 0; + static omp_nest_lock_t mutex1; + +-void thread_init() ++static void thread_init() + { + GRIB_OMP_CRITICAL(lock_grib_accessor_class_codetable_c) + { +--- eccodes-2.36.0-Source.unchanged/src/accessor/grib_accessor_class_smart_table.cc 2024-06-24 12:52:58.000000000 +0200 ++++ eccodes-2.36.0-Source/src/accessor/grib_accessor_class_smart_table.cc 2024-07-23 19:38:30.248680436 +0200 +@@ -30,7 +30,7 @@ static void thread_init() + static int once = 0; + static omp_nest_lock_t mutex; + +-void thread_init() ++static void thread_init() + { + GRIB_OMP_CRITICAL(lock_grib_accessor_class_smart_table_c) + { diff --git a/eccodes.spec b/eccodes.spec index 96f6c13..028eaa7 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,8 +3,8 @@ %endif Name: eccodes -Version: 2.35.0 -Release: 2%{?dist} +Version: 2.36.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # NOTE: dont use version 2.34.0 @@ -61,6 +61,13 @@ Source2: eccodes_create_man_pages.sh # https://jira.ecmwf.int/browse/SUP-1809 Patch1: eccodes-soversion.patch +# Add a patch to solve the multiple definition of thread_init() +# that was introduced in eccodes v2.26.0 +# This patch was provided upstream on 22-Jul-2024, see this github commit: +# https://github.com/ecmwf/eccodes/commit/809fb997282dd97058862261b1a36647f919f3b2 +Patch2: eccodes-thread-init-fix.patch + + # note that the requests to make the other issues public are filed here: # https://jira.ecmwf.int/browse/SUP-2073 # (and again, unfortunately this issue is not public) @@ -361,6 +368,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Jul 24 2024 Jos de Kloe - 2.36.0-1 +- Update to 2.36.0 + * Wed Jul 17 2024 Fedora Release Engineering - 2.35.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 916a08e..6064350 100644 --- a/sources +++ b/sources @@ -3,3 +3,4 @@ SHA512 (eccodes_test_data_20231216.tar.gz) = 86767a308841849c7ece006e9f6c68123dc SHA512 (eccodes-2.34.1-Source.tar.gz) = 3757f051fd80dd381c6687c404c835c6a890341052ded3b72a6802dde5d2d8fd83be4a8d6ec3d19592ca0c5f4211c46f1ba125ba0ef0be9cc45cac6bd3d37c1e SHA512 (eccodes_test_data_20240217.tar.gz) = c495a71f18ea01aa480b0920fbfce8d370574d412c95eb04823d0d4544fed0e2dba8e98d63e2be0a3c33a127840e7262d391373fab9304a773e9764457ade5a7 SHA512 (eccodes-2.35.0-Source.tar.gz) = 0828b33aa0a9dda1db8bbd683eeccf49a0c2df5cdc79e34684981bb59d47dd913552460d7b64bfed05d568f30a7210a1091c9431fa21378ef6fb187829fd65a9 +SHA512 (eccodes-2.36.0-Source.tar.gz) = c18df75593af6461dfa64d717ec5a6af9492bc5a851b87f13ca759343abfbf21ec6e3e5978654f95641e86429b9b105bceb9414f8d925275d2a1b305441905d0 From 6d99f551f97631971d82b09de98fe7c969b21eea Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 29 Sep 2024 16:34:16 +0200 Subject: [PATCH 74/90] update to upstream version 2.38.0 --- .gitignore | 2 ++ eccodes-soversion.patch | 8 +++--- eccodes-thread-init-fix.patch | 47 ----------------------------------- eccodes.spec | 14 ++++------- sources | 2 ++ 5 files changed, 13 insertions(+), 60 deletions(-) delete mode 100644 eccodes-thread-init-fix.patch diff --git a/.gitignore b/.gitignore index 83ac1ff..264accb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /eccodes_test_data_20240217.tar.gz /eccodes-2.35.0-Source.tar.gz /eccodes-2.36.0-Source.tar.gz +/eccodes-2.38.0-Source.tar.gz +/eccodes_test_data_20240928.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 5a3e406..76aa97c 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.35.0-Source.unchanged/fortran/CMakeLists.txt 2024-04-11 12:13:21.000000000 +0200 -+++ eccodes-2.35.0-Source/fortran/CMakeLists.txt 2024-05-04 16:18:42.732436699 +0200 +--- eccodes-2.38.0-Source.unchanged/fortran/CMakeLists.txt 2024-09-24 10:08:57.000000000 +0200 ++++ eccodes-2.38.0-Source/fortran/CMakeLists.txt 2024-09-29 11:08:52.296043336 +0200 @@ -46,7 +46,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,8 +10,8 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.35.0-Source.unchanged/src/CMakeLists.txt 2024-04-11 12:13:21.000000000 +0200 -+++ eccodes-2.35.0-Source/src/CMakeLists.txt 2024-05-04 16:18:42.733436675 +0200 +--- eccodes-2.38.0-Source.unchanged/src/CMakeLists.txt 2024-09-24 10:08:57.000000000 +0200 ++++ eccodes-2.38.0-Source/src/CMakeLists.txt 2024-09-29 11:08:52.296043336 +0200 @@ -416,6 +416,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} diff --git a/eccodes-thread-init-fix.patch b/eccodes-thread-init-fix.patch deleted file mode 100644 index 0f28ec9..0000000 --- a/eccodes-thread-init-fix.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- eccodes-2.36.0-Source.unchanged/src/accessor/grib_accessor_class_bufr_elements_table.cc 2024-06-24 12:52:58.000000000 +0200 -+++ eccodes-2.36.0-Source/src/accessor/grib_accessor_class_bufr_elements_table.cc 2024-07-23 19:38:30.211681092 +0200 -@@ -1,4 +1,3 @@ -- - /* - * (C) Copyright 2005- ECMWF. - * -@@ -28,7 +27,7 @@ static void thread_init() - static int once = 0; - static omp_nest_lock_t mutex1; - --void thread_init() -+static void thread_init() - { - GRIB_OMP_CRITICAL(lock_grib_accessor_class_bufr_elements_table_c) - { ---- eccodes-2.36.0-Source.unchanged/src/accessor/grib_accessor_class_codetable.cc 2024-06-24 12:52:58.000000000 +0200 -+++ eccodes-2.36.0-Source/src/accessor/grib_accessor_class_codetable.cc 2024-07-23 19:38:30.248680436 +0200 -@@ -20,7 +20,7 @@ grib_accessor_class* grib_accessor_class - static pthread_once_t once = PTHREAD_ONCE_INIT; - static pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER; - --void thread_init() -+static void thread_init() - { - pthread_mutexattr_t attr; - pthread_mutexattr_init(&attr); -@@ -32,7 +32,7 @@ void thread_init() - static int once = 0; - static omp_nest_lock_t mutex1; - --void thread_init() -+static void thread_init() - { - GRIB_OMP_CRITICAL(lock_grib_accessor_class_codetable_c) - { ---- eccodes-2.36.0-Source.unchanged/src/accessor/grib_accessor_class_smart_table.cc 2024-06-24 12:52:58.000000000 +0200 -+++ eccodes-2.36.0-Source/src/accessor/grib_accessor_class_smart_table.cc 2024-07-23 19:38:30.248680436 +0200 -@@ -30,7 +30,7 @@ static void thread_init() - static int once = 0; - static omp_nest_lock_t mutex; - --void thread_init() -+static void thread_init() - { - GRIB_OMP_CRITICAL(lock_grib_accessor_class_smart_table_c) - { diff --git a/eccodes.spec b/eccodes.spec index 028eaa7..dc62c3a 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,7 +3,7 @@ %endif Name: eccodes -Version: 2.36.0 +Version: 2.38.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -19,7 +19,7 @@ Summary: WMO data format decoding and encoding # note that the test_data package provided on the ECMWF version # is unversioned, so use the download date to discriminate # between different versions. -%global datapack_date 20240217 +%global datapack_date 20240928 # latest fedora-38/rawhide grib_api version is 1.27.0-18 # but this version number is to be updated as soon as we know @@ -61,13 +61,6 @@ Source2: eccodes_create_man_pages.sh # https://jira.ecmwf.int/browse/SUP-1809 Patch1: eccodes-soversion.patch -# Add a patch to solve the multiple definition of thread_init() -# that was introduced in eccodes v2.26.0 -# This patch was provided upstream on 22-Jul-2024, see this github commit: -# https://github.com/ecmwf/eccodes/commit/809fb997282dd97058862261b1a36647f919f3b2 -Patch2: eccodes-thread-init-fix.patch - - # note that the requests to make the other issues public are filed here: # https://jira.ecmwf.int/browse/SUP-2073 # (and again, unfortunately this issue is not public) @@ -368,6 +361,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Sep 29 2024 Jos de Kloe - 2.38.0-1 +- Update to 2.38.0 + * Wed Jul 24 2024 Jos de Kloe - 2.36.0-1 - Update to 2.36.0 diff --git a/sources b/sources index 6064350..a617e71 100644 --- a/sources +++ b/sources @@ -4,3 +4,5 @@ SHA512 (eccodes-2.34.1-Source.tar.gz) = 3757f051fd80dd381c6687c404c835c6a8903410 SHA512 (eccodes_test_data_20240217.tar.gz) = c495a71f18ea01aa480b0920fbfce8d370574d412c95eb04823d0d4544fed0e2dba8e98d63e2be0a3c33a127840e7262d391373fab9304a773e9764457ade5a7 SHA512 (eccodes-2.35.0-Source.tar.gz) = 0828b33aa0a9dda1db8bbd683eeccf49a0c2df5cdc79e34684981bb59d47dd913552460d7b64bfed05d568f30a7210a1091c9431fa21378ef6fb187829fd65a9 SHA512 (eccodes-2.36.0-Source.tar.gz) = c18df75593af6461dfa64d717ec5a6af9492bc5a851b87f13ca759343abfbf21ec6e3e5978654f95641e86429b9b105bceb9414f8d925275d2a1b305441905d0 +SHA512 (eccodes-2.38.0-Source.tar.gz) = 2e582f392bfda78ba703f772a7acb66f9dcb6a3e9ff20ed79c17eb5f8049a2ddc302a76a69974129e381b302b9e60b4e4574d588ee995b28b22c70d3957004d9 +SHA512 (eccodes_test_data_20240928.tar.gz) = 736d093f501115ee9d33780eec99cd0d8bdc10a559af70b861d3bee89fbb09bdb6dfdf905dfe4551b5d71761947cfefb414dfff475a06754e09e2d486708515f From 7b97f0e05e7093fa7e937d82b61dab73eef01385 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 20 Oct 2024 15:17:08 +0200 Subject: [PATCH 75/90] update to upstream version 2.38.3 --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index dc62c3a..24dd92a 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,7 +3,7 @@ %endif Name: eccodes -Version: 2.38.0 +Version: 2.38.3 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -361,6 +361,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Oct 20 2024 Jos de Kloe - 2.38.3-1 +- Update to 2.38.3 + * Sun Sep 29 2024 Jos de Kloe - 2.38.0-1 - Update to 2.38.0 From f4af10c5e22482781eff012d1744975091e029b2 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 20 Oct 2024 15:23:41 +0200 Subject: [PATCH 76/90] try again, now with new sources --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 264accb..4f030f2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /eccodes-2.36.0-Source.tar.gz /eccodes-2.38.0-Source.tar.gz /eccodes_test_data_20240928.tar.gz +/eccodes-2.38.3-Source.tar.gz diff --git a/sources b/sources index a617e71..4a01b76 100644 --- a/sources +++ b/sources @@ -6,3 +6,4 @@ SHA512 (eccodes-2.35.0-Source.tar.gz) = 0828b33aa0a9dda1db8bbd683eeccf49a0c2df5c SHA512 (eccodes-2.36.0-Source.tar.gz) = c18df75593af6461dfa64d717ec5a6af9492bc5a851b87f13ca759343abfbf21ec6e3e5978654f95641e86429b9b105bceb9414f8d925275d2a1b305441905d0 SHA512 (eccodes-2.38.0-Source.tar.gz) = 2e582f392bfda78ba703f772a7acb66f9dcb6a3e9ff20ed79c17eb5f8049a2ddc302a76a69974129e381b302b9e60b4e4574d588ee995b28b22c70d3957004d9 SHA512 (eccodes_test_data_20240928.tar.gz) = 736d093f501115ee9d33780eec99cd0d8bdc10a559af70b861d3bee89fbb09bdb6dfdf905dfe4551b5d71761947cfefb414dfff475a06754e09e2d486708515f +SHA512 (eccodes-2.38.3-Source.tar.gz) = 871090c4333aeb76c83cb221e7c2feba3b1bdb53a6b015285c85025e6aa4c22c391f5114b9c57fcd42c6f39653f38a2a98a6e7e27336f68341a9e06995b1c883 From b5f395df6cb0adad9d8164aef869e9d64a31010c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 16:35:41 +0000 Subject: [PATCH 77/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 24dd92a..161b1cc 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.38.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # NOTE: dont use version 2.34.0 @@ -361,6 +361,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 2.38.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Oct 20 2024 Jos de Kloe - 2.38.3-1 - Update to 2.38.3 From 5072d281d3d3bff20564db9737ea8c0fba74e814 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sun, 2 Feb 2025 15:46:40 +0100 Subject: [PATCH 78/90] update to new upstream version 2.39.0 --- .gitignore | 21 ++------------------- eccodes-soversion.patch | 10 +++++----- eccodes.spec | 9 ++++++--- sources | 11 ++--------- 4 files changed, 15 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 4f030f2..07c6e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,2 @@ -/eccodes-2.26.0-Source.tar.gz -/eccodes_test_data_20220526.tar.gz -/eccodes-2.27.0-Source.tar.gz -/eccodes-2.27.1-Source.tar.gz -/eccodes-2.28.0-Source.tar.gz -/eccodes-2.29.0-Source.tar.gz -/eccodes-2.30.0-Source.tar.gz -/eccodes-2.31.0-Source.tar.gz -/eccodes-2.32.1-Source.tar.gz -/eccodes_test_data_20231101.tar.gz -/eccodes-2.33.0-Source.tar.gz -/eccodes_test_data_20231216.tar.gz -/eccodes-2.34.1-Source.tar.gz -/eccodes_test_data_20240217.tar.gz -/eccodes-2.35.0-Source.tar.gz -/eccodes-2.36.0-Source.tar.gz -/eccodes-2.38.0-Source.tar.gz -/eccodes_test_data_20240928.tar.gz -/eccodes-2.38.3-Source.tar.gz +/eccodes-2.39.0-Source.tar.gz +/eccodes_test_data_20250202.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 76aa97c..4e8176d 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.38.0-Source.unchanged/fortran/CMakeLists.txt 2024-09-24 10:08:57.000000000 +0200 -+++ eccodes-2.38.0-Source/fortran/CMakeLists.txt 2024-09-29 11:08:52.296043336 +0200 +--- eccodes-2.39.0-Source.unchanged/fortran/CMakeLists.txt 2024-11-21 12:59:58.000000000 +0100 ++++ eccodes-2.39.0-Source/fortran/CMakeLists.txt 2025-02-02 14:50:54.001803198 +0100 @@ -46,7 +46,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.38.0-Source.unchanged/src/CMakeLists.txt 2024-09-24 10:08:57.000000000 +0200 -+++ eccodes-2.38.0-Source/src/CMakeLists.txt 2024-09-29 11:08:52.296043336 +0200 -@@ -416,6 +416,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.39.0-Source.unchanged/src/CMakeLists.txt 2024-11-21 12:59:58.000000000 +0100 ++++ eccodes-2.39.0-Source/src/CMakeLists.txt 2025-02-02 14:50:54.002803175 +0100 +@@ -420,6 +420,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index 161b1cc..88898f7 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,8 +3,8 @@ %endif Name: eccodes -Version: 2.38.3 -Release: 2%{?dist} +Version: 2.39.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # NOTE: dont use version 2.34.0 @@ -19,7 +19,7 @@ Summary: WMO data format decoding and encoding # note that the test_data package provided on the ECMWF version # is unversioned, so use the download date to discriminate # between different versions. -%global datapack_date 20240928 +%global datapack_date 20250202 # latest fedora-38/rawhide grib_api version is 1.27.0-18 # but this version number is to be updated as soon as we know @@ -361,6 +361,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sun Feb 02 2025 Jos de Kloe - 2.39.0-1 +- Update to 2.39.0 + * Thu Jan 16 2025 Fedora Release Engineering - 2.38.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 4a01b76..780aa23 100644 --- a/sources +++ b/sources @@ -1,9 +1,2 @@ -SHA512 (eccodes-2.33.0-Source.tar.gz) = 4afc2a9e59da54093eb318a1447904faac7371df980a57ce21e04ef98d1d7e02f10ef363a497d29f086b1f17a86ba4e46bf14898cd227eae8bbe0297c62b4183 -SHA512 (eccodes_test_data_20231216.tar.gz) = 86767a308841849c7ece006e9f6c68123dc07d8640b038e25529b91ab495d3f10ad5356e9100ef238de6756c67917be13a676f4ab0708fb381021c746e00183e -SHA512 (eccodes-2.34.1-Source.tar.gz) = 3757f051fd80dd381c6687c404c835c6a890341052ded3b72a6802dde5d2d8fd83be4a8d6ec3d19592ca0c5f4211c46f1ba125ba0ef0be9cc45cac6bd3d37c1e -SHA512 (eccodes_test_data_20240217.tar.gz) = c495a71f18ea01aa480b0920fbfce8d370574d412c95eb04823d0d4544fed0e2dba8e98d63e2be0a3c33a127840e7262d391373fab9304a773e9764457ade5a7 -SHA512 (eccodes-2.35.0-Source.tar.gz) = 0828b33aa0a9dda1db8bbd683eeccf49a0c2df5cdc79e34684981bb59d47dd913552460d7b64bfed05d568f30a7210a1091c9431fa21378ef6fb187829fd65a9 -SHA512 (eccodes-2.36.0-Source.tar.gz) = c18df75593af6461dfa64d717ec5a6af9492bc5a851b87f13ca759343abfbf21ec6e3e5978654f95641e86429b9b105bceb9414f8d925275d2a1b305441905d0 -SHA512 (eccodes-2.38.0-Source.tar.gz) = 2e582f392bfda78ba703f772a7acb66f9dcb6a3e9ff20ed79c17eb5f8049a2ddc302a76a69974129e381b302b9e60b4e4574d588ee995b28b22c70d3957004d9 -SHA512 (eccodes_test_data_20240928.tar.gz) = 736d093f501115ee9d33780eec99cd0d8bdc10a559af70b861d3bee89fbb09bdb6dfdf905dfe4551b5d71761947cfefb414dfff475a06754e09e2d486708515f -SHA512 (eccodes-2.38.3-Source.tar.gz) = 871090c4333aeb76c83cb221e7c2feba3b1bdb53a6b015285c85025e6aa4c22c391f5114b9c57fcd42c6f39653f38a2a98a6e7e27336f68341a9e06995b1c883 +SHA512 (eccodes-2.39.0-Source.tar.gz) = 7ee419cb0c2afde2b2db7159607f5d7e1c7b06545f50d7553d8aecb3d8c6d9130a9312294a5c3c3bb060c8fd59cdced531636925ec2a8b48137014a9812b1e63 +SHA512 (eccodes_test_data_20250202.tar.gz) = 8b4c7159dd7ed0e1e69068ec7dcabe94064f0d2abf9eac4fca2a9c730d500999e8edf1e7eeebba6fb12ae99b223c1b0843e31414538333c52f2508cb2d410151 From 9cda33605d783b225aa6ffa4c8077fd38bda6341 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 22 Mar 2025 16:17:51 +0100 Subject: [PATCH 79/90] update to v2.40.0 --- .gitignore | 1 + eccodes-soversion.patch | 10 +++++----- eccodes.spec | 10 ++++------ sources | 1 + 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 07c6e0d..2113600 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /eccodes-2.39.0-Source.tar.gz /eccodes_test_data_20250202.tar.gz +/eccodes-2.40.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 4e8176d..6ca8ca2 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.39.0-Source.unchanged/fortran/CMakeLists.txt 2024-11-21 12:59:58.000000000 +0100 -+++ eccodes-2.39.0-Source/fortran/CMakeLists.txt 2025-02-02 14:50:54.001803198 +0100 +--- eccodes-2.40.0-Source.unchanged/fortran/CMakeLists.txt 2025-02-12 12:04:32.000000000 +0100 ++++ eccodes-2.40.0-Source/fortran/CMakeLists.txt 2025-03-22 15:51:07.009527983 +0100 @@ -46,7 +46,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.39.0-Source.unchanged/src/CMakeLists.txt 2024-11-21 12:59:58.000000000 +0100 -+++ eccodes-2.39.0-Source/src/CMakeLists.txt 2025-02-02 14:50:54.002803175 +0100 -@@ -420,6 +420,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.40.0-Source.unchanged/src/CMakeLists.txt 2025-02-12 12:04:32.000000000 +0100 ++++ eccodes-2.40.0-Source/src/CMakeLists.txt 2025-03-22 15:51:07.009903805 +0100 +@@ -443,6 +443,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index 88898f7..ac44d42 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,15 +3,10 @@ %endif Name: eccodes -Version: 2.39.0 +Version: 2.40.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding -# NOTE: dont use version 2.34.0 -# This has some code issues when compiled with the g++ flag "-flto=auto" -# (which is default at the moment) and this makes the library and tools -# unusable. - # force the shared libraries to have these so versions %global so_version 0.1 %global so_version_f90 0.1 @@ -361,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sat Mar 22 2025 Jos de Kloe - 2.40.0-1 +- Update to 2.40.0 + * Sun Feb 02 2025 Jos de Kloe - 2.39.0-1 - Update to 2.39.0 diff --git a/sources b/sources index 780aa23..d3bb417 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (eccodes-2.39.0-Source.tar.gz) = 7ee419cb0c2afde2b2db7159607f5d7e1c7b06545f50d7553d8aecb3d8c6d9130a9312294a5c3c3bb060c8fd59cdced531636925ec2a8b48137014a9812b1e63 SHA512 (eccodes_test_data_20250202.tar.gz) = 8b4c7159dd7ed0e1e69068ec7dcabe94064f0d2abf9eac4fca2a9c730d500999e8edf1e7eeebba6fb12ae99b223c1b0843e31414538333c52f2508cb2d410151 +SHA512 (eccodes-2.40.0-Source.tar.gz) = 39b09da398a864888f1b7da867adae63da9e512a865807c1dd0f4b76e242c46d6ec75f7db3a554c01c4fb60dd9677cd8b77bc03dac89931cbdf461c607b100c8 From 61a8f9e8f497dfa09d53caa5febd9ca849a2e072 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 29 May 2025 15:31:06 -0600 Subject: [PATCH 80/90] Drop old source from sources --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index d3bb417..0e3778c 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (eccodes-2.39.0-Source.tar.gz) = 7ee419cb0c2afde2b2db7159607f5d7e1c7b06545f50d7553d8aecb3d8c6d9130a9312294a5c3c3bb060c8fd59cdced531636925ec2a8b48137014a9812b1e63 SHA512 (eccodes_test_data_20250202.tar.gz) = 8b4c7159dd7ed0e1e69068ec7dcabe94064f0d2abf9eac4fca2a9c730d500999e8edf1e7eeebba6fb12ae99b223c1b0843e31414538333c52f2508cb2d410151 SHA512 (eccodes-2.40.0-Source.tar.gz) = 39b09da398a864888f1b7da867adae63da9e512a865807c1dd0f4b76e242c46d6ec75f7db3a554c01c4fb60dd9677cd8b77bc03dac89931cbdf461c607b100c8 From 7a579d5a5ed84d316a64a4ee922be865c636d899 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Sat, 19 Jul 2025 17:07:05 +0200 Subject: [PATCH 81/90] update to new upstream version 2.42.0 --- .gitignore | 1 + eccodes-soversion.patch | 12 ++++++------ eccodes.spec | 7 +++++-- sources | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2113600..160cb5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /eccodes-2.39.0-Source.tar.gz /eccodes_test_data_20250202.tar.gz /eccodes-2.40.0-Source.tar.gz +/eccodes-2.42.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index 6ca8ca2..e034ca0 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.40.0-Source.unchanged/fortran/CMakeLists.txt 2025-02-12 12:04:32.000000000 +0100 -+++ eccodes-2.40.0-Source/fortran/CMakeLists.txt 2025-03-22 15:51:07.009527983 +0100 +--- eccodes-2.42.0-Source.unchanged/fortran/CMakeLists.txt 2025-06-30 10:44:08.000000000 +0200 ++++ eccodes-2.42.0-Source/fortran/CMakeLists.txt 2025-07-19 16:36:56.908027305 +0200 @@ -46,7 +46,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,13 +10,13 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.40.0-Source.unchanged/src/CMakeLists.txt 2025-02-12 12:04:32.000000000 +0100 -+++ eccodes-2.40.0-Source/src/CMakeLists.txt 2025-03-22 15:51:07.009903805 +0100 -@@ -443,6 +443,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.42.0-Source.unchanged/src/eccodes/CMakeLists.txt 2025-06-30 10:44:08.000000000 +0200 ++++ eccodes-2.42.0-Source/src/eccodes/CMakeLists.txt 2025-07-19 16:36:56.908394153 +0200 +@@ -440,6 +440,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} -+ SOVERSION ${ECCODES_SOVERSION} ++ SOVERSION ${ECCODES_SOVERSION} + INSTALL_HEADERS_LIST grib_api.h diff --git a/eccodes.spec b/eccodes.spec index ac44d42..8926b19 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,7 +3,7 @@ %endif Name: eccodes -Version: 2.40.0 +Version: 2.42.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding @@ -60,7 +60,7 @@ Patch1: eccodes-soversion.patch # https://jira.ecmwf.int/browse/SUP-2073 # (and again, unfortunately this issue is not public) -BuildRequires: cmake3 +BuildRequires: cmake3 >= 3.18 BuildRequires: gcc-c++ BuildRequires: gcc-gfortran BuildRequires: /usr/bin/git @@ -356,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Sat Jul 19 2025 Jos de Kloe - 2.42.0-1 +- Update to 2.42.0 (2.41.0 was skipped due to an upstream build bug) + * Sat Mar 22 2025 Jos de Kloe - 2.40.0-1 - Update to 2.40.0 diff --git a/sources b/sources index 0e3778c..6cabd92 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (eccodes_test_data_20250202.tar.gz) = 8b4c7159dd7ed0e1e69068ec7dcabe94064f0d2abf9eac4fca2a9c730d500999e8edf1e7eeebba6fb12ae99b223c1b0843e31414538333c52f2508cb2d410151 SHA512 (eccodes-2.40.0-Source.tar.gz) = 39b09da398a864888f1b7da867adae63da9e512a865807c1dd0f4b76e242c46d6ec75f7db3a554c01c4fb60dd9677cd8b77bc03dac89931cbdf461c607b100c8 +SHA512 (eccodes-2.42.0-Source.tar.gz) = 205246b250762ab6e7ac3050726ac5ce67ab689c8c393b153e7c084fb71edc40d64ee04e2fb32b3ad2a1426e65581126c0c8288e9088c27a7468f6b534f29b58 From 2421d9263b3306ce43125350e70da72a0b44bb7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:41:33 +0000 Subject: [PATCH 82/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- eccodes.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 8926b19..d3e6f68 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.42.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -356,6 +356,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 2.42.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jul 19 2025 Jos de Kloe - 2.42.0-1 - Update to 2.42.0 (2.41.0 was skipped due to an upstream build bug) From 19c6a19751531cdd90eb2cf233c51dc425d927b7 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Wed, 30 Jul 2025 12:37:27 +0200 Subject: [PATCH 83/90] fix upgrade problem --- eccodes.spec | 20 ++++++++- ...des_revert_directory_to_symlink_changes.py | 44 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 eccodes_revert_directory_to_symlink_changes.py diff --git a/eccodes.spec b/eccodes.spec index d3e6f68..1eee6cd 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -52,6 +52,9 @@ Source1: https://get.ecmwf.int/repository/test-data/eccodes/eccodes_test_ # a custom script to create man pages Source2: eccodes_create_man_pages.sh +# a custom script to undo directory to symbolic-link changes +Source3: eccodes_revert_directory_to_symlink_changes.py + # Add soversion to the shared libraries, since upstream refuses to do so # https://jira.ecmwf.int/browse/SUP-1809 Patch1: eccodes-soversion.patch @@ -78,6 +81,9 @@ BuildRequires: perl(File::Compare) # For creation of man pages BuildRequires: help2man +# For undoing the directory-to-symlink rename in the data package +BuildRequires: python3 + # 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 # installing the base package. It will probably be pretty useless, @@ -252,6 +258,10 @@ cp fortran/grib_api_constants.h %{_vpath_builddir}/fortran/ mkdir -p %{buildroot}%{_fmoddir} mv %{buildroot}%{_includedir}/*.mod %{buildroot}%{_fmoddir}/ +# undo a change from directories to symbolic links in the data package +# since the rpm tool cannot handle upgrades if this happens. +%{python3} %{SOURCE3} %{buildroot}%{_datadir}/%{name} + # remove a script that does not belong in the doc section # and triggers an rpmlint error rm %{buildroot}%{_datadir}/%{name}/definitions/installDefinitions.sh @@ -311,6 +321,8 @@ sed -i 's|^libs=.*$|libs=-L${libdir} -leccodes_f90 -leccodes|g' %{buildroot}/%{_ %ldconfig_scriptlets + +##################################################### %check cd %{_vpath_builddir} @@ -331,7 +343,7 @@ ctest3 -V %{?_smp_mflags} %files %license LICENSE -%doc README.md ChangeLog AUTHORS NEWS NOTICE +%doc ChangeLog AUTHORS NEWS NOTICE %{_bindir}/* %{_libdir}/*.so.* %{_mandir}/man1/*.1* @@ -356,6 +368,12 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog + +* Wed Jul 30 2025 Jos de Kloe - 2.42.0-2 +- Add calling a little python script in the install stage to revert + the (upstream) replacing of directories by a symlinks + which causes upgrade problems with rpm for the data package. + * Wed Jul 23 2025 Fedora Release Engineering - 2.42.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/eccodes_revert_directory_to_symlink_changes.py b/eccodes_revert_directory_to_symlink_changes.py new file mode 100644 index 0000000..2fd424b --- /dev/null +++ b/eccodes_revert_directory_to_symlink_changes.py @@ -0,0 +1,44 @@ +#!/usr/bin/python3 + +''' +in eccodes 2.42.0 a number of directories in the table definitions +directory tree have been replaced upstream by symbolic links to +some other directories. + +It turns out that the rpm tool can not handle this and refused to +allow a user upgrade the package if this happens. +See: https://bugzilla.redhat.com/show_bug.cgi?id=2384303 + +Therefore this little python script reverts the change and replaces +these symbolic links again with a copy of the directory to which +they point. +''' + +import os +import sys +import shutil + +problematic_base_dirs = [ + 'definitions/bufr/tables/0/local/8/78', + 'definitions/bufr/tables/0/wmo'] + +data_dir = sys.argv[1] + +for problem_dir in problematic_base_dirs: + full_base_dir_name = os.path.join(data_dir, problem_dir) + subdirs = os.listdir(full_base_dir_name) + for subdir in subdirs: + # check if the subdir is a symbolic link + full_dir_name = os.path.join(full_base_dir_name, subdir) + if os.path.islink(full_dir_name): + # request the target to which the symbolic link points + target_dir = os.path.realpath(full_dir_name) + + print(f'replacing symbolic link: {full_dir_name}') + print(f'by a copy of its target: {target_dir}') + + # remove the symbolic link + os.remove(full_dir_name) + + # and copy the target to take its place + shutil.copytree(target_dir, full_dir_name) From be0e64d22b4d2f11050e523594ff783530a8c9e3 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Wed, 30 Jul 2025 12:40:04 +0200 Subject: [PATCH 84/90] bump release to 3 --- eccodes.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index 1eee6cd..69c91e4 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.42.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -369,7 +369,7 @@ ctest3 -V %{?_smp_mflags} %changelog -* Wed Jul 30 2025 Jos de Kloe - 2.42.0-2 +* Wed Jul 30 2025 Jos de Kloe - 2.42.0-3 - Add calling a little python script in the install stage to revert the (upstream) replacing of directories by a symlinks which causes upgrade problems with rpm for the data package. From 2c0f7d9a93528745d01ecc4854e8ba4f90324f1d Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Mon, 11 Aug 2025 14:09:32 +0200 Subject: [PATCH 85/90] next try to use a LUA scriptlet in case directories are replaced by symbolic links by upstream --- .gitignore | 1 - eccodes.spec | 117 ++++++++++++++++-- ...des_revert_directory_to_symlink_changes.py | 44 ------- 3 files changed, 106 insertions(+), 56 deletions(-) delete mode 100644 eccodes_revert_directory_to_symlink_changes.py diff --git a/.gitignore b/.gitignore index 160cb5d..c37fff4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -/eccodes-2.39.0-Source.tar.gz /eccodes_test_data_20250202.tar.gz /eccodes-2.40.0-Source.tar.gz /eccodes-2.42.0-Source.tar.gz diff --git a/eccodes.spec b/eccodes.spec index 69c91e4..e2a97ad 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.42.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -52,9 +52,6 @@ Source1: https://get.ecmwf.int/repository/test-data/eccodes/eccodes_test_ # a custom script to create man pages Source2: eccodes_create_man_pages.sh -# a custom script to undo directory to symbolic-link changes -Source3: eccodes_revert_directory_to_symlink_changes.py - # Add soversion to the shared libraries, since upstream refuses to do so # https://jira.ecmwf.int/browse/SUP-1809 Patch1: eccodes-soversion.patch @@ -81,9 +78,6 @@ BuildRequires: perl(File::Compare) # For creation of man pages BuildRequires: help2man -# For undoing the directory-to-symlink rename in the data package -BuildRequires: python3 - # 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 # installing the base package. It will probably be pretty useless, @@ -175,6 +169,74 @@ both the official WMO tables and a number of often used local definitions by ECMWF and other meteorological centers. ##################################################### +# include a LUA scriptlet as suggested on: +# https://docs.fedoraproject.org/en-US/packaging-guidelines/Directory_Replacement/ +# to assist in replacing a directory by a symlink + +%pretrans -n eccodes-data -p + +-- This should solve a problem where directories were replaced +-- by symbolic links when upgrading eccodes from 2.41.0 to 2.42.0 + +problematic_dirs = { + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/1", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/110", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/174", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/2", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/20", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/21", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/221", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/222", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/223", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/225", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/226", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/227", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/228", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/229", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/230", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/231", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/232", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/233", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/234", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/235", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/236", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/237", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/31", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/41", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/42", + "/usr/share/eccodes/definitions/bufr/tables/0/local/8/78/64", + "/usr/share/eccodes/definitions/bufr/tables/0/wmo/10", + "/usr/share/eccodes/definitions/bufr/tables/0/wmo/11", + "/usr/share/eccodes/definitions/bufr/tables/0/wmo/12", + "/usr/share/eccodes/definitions/bufr/tables/0/wmo/7", + "/usr/share/eccodes/definitions/bufr/tables/0/wmo/8", + "/usr/share/eccodes/definitions/bufr/tables/0/wmo/9"} + +for index, path in ipairs(problematic_dirs) do + print("handling path:" .. index .. ":" .. path) + st = posix.stat(path) + if st and st.type == "directory" then + status = os.rename(path, path .. ".rpmmoved") + if status then + print("renamed:" .. path .. " to " .. path .. ".rpmmoved") + end + if not status then + suffix = 0 + while not status do + suffix = suffix + 1 + status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix) + if status then + print("renamed:" .. path .. ".rpmmoved to " .. path .. ".rpmmoved." .. suffix) + end + end + os.rename(path, path .. ".rpmmoved") + print("renamed:" .. path .. " to " .. path .. ".rpmmoved") + end + end +end + +--##################################################### + %package doc Summary: Documentation and example code BuildArch: noarch @@ -258,10 +320,6 @@ cp fortran/grib_api_constants.h %{_vpath_builddir}/fortran/ mkdir -p %{buildroot}%{_fmoddir} mv %{buildroot}%{_includedir}/*.mod %{buildroot}%{_fmoddir}/ -# undo a change from directories to symbolic links in the data package -# since the rpm tool cannot handle upgrades if this happens. -%{python3} %{SOURCE3} %{buildroot}%{_datadir}/%{name} - # remove a script that does not belong in the doc section # and triggers an rpmlint error rm %{buildroot}%{_datadir}/%{name}/definitions/installDefinitions.sh @@ -363,12 +421,49 @@ ctest3 -V %{?_smp_mflags} %{_datadir}/%{name}/definitions/ %{_datadir}/%{name}/samples/ %{_datadir}/%{name}/ifs_samples/ +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/1.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/110.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/174.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/2.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/20.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/21.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/221.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/222.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/223.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/225.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/226.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/227.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/228.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/229.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/230.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/231.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/232.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/233.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/234.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/235.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/236.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/237.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/31.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/41.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/42.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/64.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/10.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/11.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/12.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/7.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/8.rpmmoved +%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/9.rpmmoved %files doc %doc %{_datadir}/doc/%{name}/ %changelog +* Tue Jul 29 2025 Jos de Kloe - 2.42.0-4 +- Add a LUA script in a pretrans section to assist in replacing a directory + by a symlink (this removes the need for the python script added in + the previous commit) + * Wed Jul 30 2025 Jos de Kloe - 2.42.0-3 - Add calling a little python script in the install stage to revert the (upstream) replacing of directories by a symlinks diff --git a/eccodes_revert_directory_to_symlink_changes.py b/eccodes_revert_directory_to_symlink_changes.py deleted file mode 100644 index 2fd424b..0000000 --- a/eccodes_revert_directory_to_symlink_changes.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/python3 - -''' -in eccodes 2.42.0 a number of directories in the table definitions -directory tree have been replaced upstream by symbolic links to -some other directories. - -It turns out that the rpm tool can not handle this and refused to -allow a user upgrade the package if this happens. -See: https://bugzilla.redhat.com/show_bug.cgi?id=2384303 - -Therefore this little python script reverts the change and replaces -these symbolic links again with a copy of the directory to which -they point. -''' - -import os -import sys -import shutil - -problematic_base_dirs = [ - 'definitions/bufr/tables/0/local/8/78', - 'definitions/bufr/tables/0/wmo'] - -data_dir = sys.argv[1] - -for problem_dir in problematic_base_dirs: - full_base_dir_name = os.path.join(data_dir, problem_dir) - subdirs = os.listdir(full_base_dir_name) - for subdir in subdirs: - # check if the subdir is a symbolic link - full_dir_name = os.path.join(full_base_dir_name, subdir) - if os.path.islink(full_dir_name): - # request the target to which the symbolic link points - target_dir = os.path.realpath(full_dir_name) - - print(f'replacing symbolic link: {full_dir_name}') - print(f'by a copy of its target: {target_dir}') - - # remove the symbolic link - os.remove(full_dir_name) - - # and copy the target to take its place - shutil.copytree(target_dir, full_dir_name) From ac7dca3ac49296175db72c6726b718c32a4f1fc1 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Mon, 11 Aug 2025 14:24:13 +0200 Subject: [PATCH 86/90] fix wrong changelog date and fix a bug in the ghost definitions --- eccodes.spec | 69 ++++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/eccodes.spec b/eccodes.spec index e2a97ad..8cac5d4 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.42.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -422,43 +422,48 @@ ctest3 -V %{?_smp_mflags} %{_datadir}/%{name}/samples/ %{_datadir}/%{name}/ifs_samples/ %ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/1.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/110.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/174.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/2.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/20.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/21.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/221.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/222.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/223.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/225.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/226.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/227.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/228.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/229.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/230.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/231.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/232.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/233.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/234.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/235.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/236.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/237.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/31.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/41.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/42.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/local/8/78/64.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/10.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/11.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/12.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/7.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/8.rpmmoved -%ghost %{_datadir}/%{name}/definitions/definitions/bufr/tables/0/wmo/9.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/110.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/174.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/2.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/20.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/21.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/221.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/222.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/223.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/225.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/226.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/227.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/228.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/229.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/230.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/231.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/232.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/233.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/234.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/235.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/236.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/237.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/31.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/41.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/42.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/local/8/78/64.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/wmo/10.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/wmo/11.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/wmo/12.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/wmo/7.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/wmo/8.rpmmoved +%ghost %{_datadir}/%{name}/definitions/bufr/tables/0/wmo/9.rpmmoved %files doc %doc %{_datadir}/doc/%{name}/ %changelog +* Mon Aug 11 2025 Jos de Kloe - 2.42.0-5 +- Forgot to update the changelog date for the previous commit, so fixed this + with this update. +- Also fix a typo in the ghost definitions. + * Tue Jul 29 2025 Jos de Kloe - 2.42.0-4 - Add a LUA script in a pretrans section to assist in replacing a directory by a symlink (this removes the need for the python script added in From 9b5ba7896939f5965e08347c056bbac5cebd5f8c Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Mon, 11 Aug 2025 15:36:45 +0200 Subject: [PATCH 87/90] ensure changelog dates are in chronological order again --- eccodes.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 8cac5d4..32375c8 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -464,7 +464,7 @@ ctest3 -V %{?_smp_mflags} with this update. - Also fix a typo in the ghost definitions. -* Tue Jul 29 2025 Jos de Kloe - 2.42.0-4 +* Mon Aug 11 2025 Jos de Kloe - 2.42.0-4 - Add a LUA script in a pretrans section to assist in replacing a directory by a symlink (this removes the need for the python script added in the previous commit) From 47a1f21238d5883d78a83bf01bac2ddc49316290 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 22 Aug 2025 08:38:32 -0600 Subject: [PATCH 88/90] Rebuild for netcdf 4.9.3 soname bump --- eccodes.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 32375c8..4d0d168 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.42.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -458,6 +458,8 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog +* Fri Aug 22 2025 Orion Poplawski - 2.42.0-6 +- Rebuild for netcdf 4.9.3 soname bump * Mon Aug 11 2025 Jos de Kloe - 2.42.0-5 - Forgot to update the changelog date for the previous commit, so fixed this From d72a2e3bb0745649f7ccaa0657cd7a5921ee1528 Mon Sep 17 00:00:00 2001 From: Jos de Kloe Date: Fri, 7 Nov 2025 11:50:22 +0100 Subject: [PATCH 89/90] update to v2.44.0 --- .gitignore | 1 + eccodes-soversion.patch | 10 +++++----- eccodes.spec | 8 ++++++-- sources | 1 + 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c37fff4..e66b05a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /eccodes_test_data_20250202.tar.gz /eccodes-2.40.0-Source.tar.gz /eccodes-2.42.0-Source.tar.gz +/eccodes-2.44.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index e034ca0..fd4b224 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.42.0-Source.unchanged/fortran/CMakeLists.txt 2025-06-30 10:44:08.000000000 +0200 -+++ eccodes-2.42.0-Source/fortran/CMakeLists.txt 2025-07-19 16:36:56.908027305 +0200 +--- eccodes-2.44.0-Source.unchanged/fortran/CMakeLists.txt 2025-10-06 11:49:11.000000000 +0200 ++++ eccodes-2.44.0-Source/fortran/CMakeLists.txt 2025-11-07 11:33:03.765320420 +0100 @@ -46,7 +46,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ @@ -10,9 +10,9 @@ if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 ) # Installed module directory is not in the PUBLIC INCLUDES! ---- eccodes-2.42.0-Source.unchanged/src/eccodes/CMakeLists.txt 2025-06-30 10:44:08.000000000 +0200 -+++ eccodes-2.42.0-Source/src/eccodes/CMakeLists.txt 2025-07-19 16:36:56.908394153 +0200 -@@ -440,6 +440,8 @@ ecbuild_add_library( TARGET eccodes +--- eccodes-2.44.0-Source.unchanged/src/eccodes/CMakeLists.txt 2025-10-06 11:49:11.000000000 +0200 ++++ eccodes-2.44.0-Source/src/eccodes/CMakeLists.txt 2025-11-07 11:33:03.784437554 +0100 +@@ -447,6 +447,8 @@ ecbuild_add_library( TARGET eccodes PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES} PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES} TEMPLATES ${eccodes_extra_src_files} diff --git a/eccodes.spec b/eccodes.spec index 4d0d168..17e866b 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,8 +3,8 @@ %endif Name: eccodes -Version: 2.42.0 -Release: 6%{?dist} +Version: 2.44.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -458,6 +458,10 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog + +* Fri Nov 07 2025 Jos de Kloe - 2.44.0-1 +- Update to 2.44.0 + * Fri Aug 22 2025 Orion Poplawski - 2.42.0-6 - Rebuild for netcdf 4.9.3 soname bump diff --git a/sources b/sources index 6cabd92..4dc5dc6 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (eccodes_test_data_20250202.tar.gz) = 8b4c7159dd7ed0e1e69068ec7dcabe94064f0d2abf9eac4fca2a9c730d500999e8edf1e7eeebba6fb12ae99b223c1b0843e31414538333c52f2508cb2d410151 SHA512 (eccodes-2.40.0-Source.tar.gz) = 39b09da398a864888f1b7da867adae63da9e512a865807c1dd0f4b76e242c46d6ec75f7db3a554c01c4fb60dd9677cd8b77bc03dac89931cbdf461c607b100c8 SHA512 (eccodes-2.42.0-Source.tar.gz) = 205246b250762ab6e7ac3050726ac5ce67ab689c8c393b153e7c084fb71edc40d64ee04e2fb32b3ad2a1426e65581126c0c8288e9088c27a7468f6b534f29b58 +SHA512 (eccodes-2.44.0-Source.tar.gz) = 63f81db07103ab3c6c0497ca3d0bae5b8a0841ed83a2b88831ddce756489a84aa394af7673c1438e2ea7a55107970cf87b8222da31321ef70ecc55cc99a3ddf5 From 412578264796d4829b722b0fb1ea6f0146a2f269 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Mon, 10 Nov 2025 17:59:52 +0100 Subject: [PATCH 90/90] Allow to build with CMake 4.0 (rhbz#2380563) --- eccodes.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/eccodes.spec b/eccodes.spec index 17e866b..bed4797 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -4,7 +4,7 @@ Name: eccodes Version: 2.44.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -260,6 +260,8 @@ tar xf %SOURCE1 popd %build +# TODO: Please submit an issue to upstream (rhbz#2380563) +export CMAKE_POLICY_VERSION_MINIMUM=3.5 #-- The following features are disabled by default and not switched on: # @@ -459,6 +461,9 @@ ctest3 -V %{?_smp_mflags} %changelog +* Mon Nov 10 2025 Cristian Le - 2.44.0-2 +- Allow to build with CMake 4.0 (rhbz#2380563) + * Fri Nov 07 2025 Jos de Kloe - 2.44.0-1 - Update to 2.44.0