From aa231a33bea0a8375a4180e05ddcb1e95512d8e2 Mon Sep 17 00:00:00 2001
From: Jos de Kloe <josdekloe@gmail.com>
Date: Sun, 28 Mar 2021 13:06:32 +0200
Subject: [PATCH] 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 $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
@@ -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 <josdekloe@gmail.com> - 2.21.0-1
+- Upgrade to upstream version 2.21.0
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 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