From 02475f35d3dcae981b53f961db7b63df8353b5d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 04:14:43 +0000 Subject: [PATCH 1/5] - 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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