new upstream version
This commit is contained in:
parent
cd4e74ca87
commit
aa231a33be
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@
|
|||||||
/eccodes-2.19.0-Source.tar.gz
|
/eccodes-2.19.0-Source.tar.gz
|
||||||
/eccodes-2.19.1-Source.tar.gz
|
/eccodes-2.19.1-Source.tar.gz
|
||||||
/eccodes-2.20.0-Source.tar.gz
|
/eccodes-2.20.0-Source.tar.gz
|
||||||
|
/eccodes-2.21.0-Source.tar.gz
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- eccodes-2.20.0-Source.unchanged/fortran/CMakeLists.txt 2021-01-20 13:18:04.000000000 +0100
|
--- eccodes-2.21.0-Source.unchanged/fortran/CMakeLists.txt 2021-03-24 12:58:39.000000000 +0100
|
||||||
+++ eccodes-2.20.0-Source/fortran/CMakeLists.txt 2021-01-23 17:35:32.042141813 +0100
|
+++ eccodes-2.21.0-Source/fortran/CMakeLists.txt 2021-03-28 11:10:48.975174329 +0200
|
||||||
@@ -49,7 +49,8 @@ if( HAVE_FORTRAN )
|
@@ -49,7 +49,8 @@ if( HAVE_FORTRAN )
|
||||||
GENERATED grib_f90.f90 eccodes_f90.f90
|
GENERATED grib_f90.f90 eccodes_f90.f90
|
||||||
PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
|
PUBLIC_INCLUDES $<BUILD_INTERFACE:${CMAKE_Fortran_MODULE_DIRECTORY}>
|
||||||
@ -10,8 +10,8 @@
|
|||||||
|
|
||||||
if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 )
|
if( DEFINED ecbuild_VERSION AND NOT ${ecbuild_VERSION} VERSION_LESS 3.1 )
|
||||||
# Installed module directory is not in the PUBLIC INCLUDES!
|
# 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.21.0-Source.unchanged/src/CMakeLists.txt 2021-03-24 12:58:39.000000000 +0100
|
||||||
+++ eccodes-2.20.0-Source/src/CMakeLists.txt 2021-01-23 17:35:32.043141787 +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
|
@@ -445,6 +445,7 @@ ecbuild_add_library( TARGET eccodes
|
||||||
PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES}
|
PRIVATE_LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${AEC_LIBRARIES} ${PNG_LIBRARIES}
|
||||||
PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES}
|
PUBLIC_LIBS ${CMATH_LIBRARIES} ${THREADS_LIBRARIES}
|
||||||
|
11
eccodes.spec
11
eccodes.spec
@ -1,6 +1,6 @@
|
|||||||
Name: eccodes
|
Name: eccodes
|
||||||
Version: 2.20.0
|
Version: 2.21.0
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: WMO data format decoding and encoding
|
Summary: WMO data format decoding and encoding
|
||||||
|
|
||||||
# force the shared libraries to have these so versions
|
# force the shared libraries to have these so versions
|
||||||
@ -245,10 +245,12 @@ chmod 644 AUTHORS LICENSE
|
|||||||
-DCMAKE_SKIP_INSTALL_RPATH=TRUE \
|
-DCMAKE_SKIP_INSTALL_RPATH=TRUE \
|
||||||
-DECCODES_SOVERSION=%{so_version} \
|
-DECCODES_SOVERSION=%{so_version} \
|
||||||
-DECCODES_SOVERSION_F90=%{so_version_f90} \
|
-DECCODES_SOVERSION_F90=%{so_version_f90} \
|
||||||
-DCMAKE_Fortran_FLAGS="-fallow-argument-mismatch" \
|
|
||||||
-DCMAKE_Fortran_FLAGS="-fPIC" \
|
-DCMAKE_Fortran_FLAGS="-fPIC" \
|
||||||
-DENABLE_PYTHON=OFF
|
-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.
|
# note the final '..' is no longer needed to the cmake3 call.
|
||||||
# this is now hidden in the %%cmake3 macro
|
# this is now hidden in the %%cmake3 macro
|
||||||
|
|
||||||
@ -354,6 +356,9 @@ ctest3 -V %{?_smp_mflags}
|
|||||||
%doc %{_datadir}/doc/%{name}/
|
%doc %{_datadir}/doc/%{name}/
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.20.0-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
1
sources
1
sources
@ -1,2 +1,3 @@
|
|||||||
SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e
|
SHA512 (eccodes_test_data_20200626.tar.gz) = 553eb69f3664c2f847c5ee7a84066e814ef03b3148ae2c13d845891038336daca815673650f1d06efee4f4a1ddaa4326f2ddfbe81d29382e3f25608b249b8d9e
|
||||||
SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d1caf60614ececfe2fabe07d7c794baf120f5df82716f37b2540f7f6a6cd82f04070a78bf65dc7d499ca50dc0
|
SHA512 (eccodes-2.20.0-Source.tar.gz) = ea2953987c4713b230e6d75ad5ae1dbbeea2633d1caf60614ececfe2fabe07d7c794baf120f5df82716f37b2540f7f6a6cd82f04070a78bf65dc7d499ca50dc0
|
||||||
|
SHA512 (eccodes-2.21.0-Source.tar.gz) = f2ba8361b99800646a92f5f5beb7ec2facf2ee3b8a3f7985d9681a23b2faae778004c8c688ebe4b3a8492e99c76422c66ecc8943d12d3342d5bc1d38362ccf06
|
||||||
|
Loading…
Reference in New Issue
Block a user