diff --git a/.gitignore b/.gitignore index e66b05a..6e2fa0d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /eccodes-2.40.0-Source.tar.gz /eccodes-2.42.0-Source.tar.gz /eccodes-2.44.0-Source.tar.gz +/eccodes-2.45.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index fd4b224..1d08917 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,6 +1,6 @@ ---- 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 ) +--- eccodes-2.45.0-Source.unchanged/fortran/CMakeLists.txt 2026-01-19 14:07:07.000000000 +0100 ++++ eccodes-2.45.0-Source/fortran/CMakeLists.txt 2026-01-28 13:41:51.406812493 +0100 +@@ -74,7 +74,8 @@ if( HAVE_FORTRAN ) GENERATED grib_f90.f90 eccodes_f90.f90 PUBLIC_INCLUDES $ $ @@ -10,14 +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.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} -+ SOVERSION ${ECCODES_SOVERSION} +--- eccodes-2.45.0-Source.unchanged/src/eccodes/CMakeLists.txt 2026-01-19 14:07:17.000000000 +0100 ++++ eccodes-2.45.0-Source/src/eccodes/CMakeLists.txt 2026-01-28 13:45:12.736091176 +0100 +@@ -453,6 +453,8 @@ ecbuild_add_library( + ${CMATH_LIBRARIES} + ${THREADS_LIBRARIES} + TEMPLATES ${eccodes_extra_src_files} ++ SOVERSION ${ECCODES_SOVERSION} + - INSTALL_HEADERS_LIST - grib_api.h - eccodes.h + INSTALL_HEADERS_LIST + grib_api.h + eccodes.h diff --git a/eccodes.spec b/eccodes.spec index 64408c3..dc10b0f 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -3,8 +3,8 @@ %endif Name: eccodes -Version: 2.44.0 -Release: 3%{?dist} +Version: 2.45.0 +Release: 1%{?dist} Summary: WMO data format decoding and encoding # force the shared libraries to have these so versions @@ -260,7 +260,10 @@ tar xf %SOURCE1 popd %build -# TODO: Please submit an issue to upstream (rhbz#2380563) + +# In response to change proposal CMake 4.0 (rhbz#2380563) +# upstream support has been requested in this feature request: +# https://github.com/ecmwf/eccodes/issues/409 export CMAKE_POLICY_VERSION_MINIMUM=3.5 #-- The following features are disabled by default and not switched on: @@ -275,7 +278,8 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5 # * PNG , support for PNG decoding/encoding # * ECCODES_OMP_THREADS , enable OMP threads # * EXTRA_TESTS , enable extended regression testing -# +# * EXTRA_TOOLS , enable the installation of tools for the METAR format + #-- 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: @@ -295,13 +299,23 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5 # when I try to build for armv7hl (other archs do not complain ......) # I have no idea what causes this difference in behaviour. +# Note: the option: +# -DENABLE_MEMFS=ON +# reformats the definition tables into big binary blobs to be included +# in the c code. +# This reduces the install size from 160MB to 72MB (in version 2.45.0), +# but it also makes it impossible for users to create and use their own +# local table definitions. Therefore, to allow flexibility on the users +# side, this option is not activated at the moment. + %cmake3 -DINSTALL_LIB_DIR=%{_lib} \ -DENABLE_ECCODES_OMP_THREADS=ON \ - -DENABLE_EXTRA_TESTS=ON \ -DENABLE_JPG=ON \ -DENABLE_PNG=ON \ -DENABLE_FORTRAN=ON \ -DENABLE_NETCDF=ON \ + -DECCODES_INSTALL_EXTRA_TOOLS=ON \ + -DENABLE_EXTRA_TESTS=ON \ -DCMAKE_SKIP_INSTALL_RPATH=TRUE \ -DECCODES_SOVERSION=%{so_version} \ -DECCODES_SOVERSION_F90=%{so_version_f90} \ @@ -460,10 +474,13 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/ %changelog + +* Wed Jan 28 2026 Jos de Kloe - 2.45.0-1 +- Update to 2.45.0 + * Fri Jan 16 2026 Fedora Release Engineering - 2.44.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - * Mon Nov 10 2025 Cristian Le - 2.44.0-2 - Allow to build with CMake 4.0 (rhbz#2380563) diff --git a/sources b/sources index 4dc5dc6..482a87e 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (eccodes_test_data_20250202.tar.gz) = 8b4c7159dd7ed0e1e69068ec7dcabe94064 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 +SHA512 (eccodes-2.45.0-Source.tar.gz) = aa5f5c01ce9d551706ca8242ab6a4663b0c6bf114aa229e2aa01dba549fac1d3d57a06cf8907f18dcba4c9f1a446cbc253c3675ebf77f62ee5ac2c4fb8800dce