From 0f7b84f6619d1f6e8e23e4830cccbc449aa8ade4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 18:11:12 +0000 Subject: [PATCH 01/33] 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 02/33] 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 03/33] 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 04/33] 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 05/33] 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 06/33] 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 07/33] 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 08/33] 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 09/33] 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 10/33] 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 11/33] 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 12/33] 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 13/33] 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 14/33] 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 15/33] 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 16/33] 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 17/33] 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 18/33] 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 19/33] 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 20/33] 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 21/33] 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 22/33] 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 23/33] 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 24/33] 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 25/33] 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 26/33] 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 27/33] 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 28/33] 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 29/33] 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 30/33] 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 31/33] 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 32/33] 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 33/33] 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