The package rpms/eccodes.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=14cb429b58...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=1f6d2391b1...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=cf73af9f25...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=9c825e7768....
Change:
+%ifarch i686
+%ifarch i686 armv7hl
-ExcludeArch: armv7hl
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 9c825e77687b5393d30224750ccbb81288e56b9a
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Jul 27 17:50:30 2019 +0200
remove manual tests and activate ExcludeArch statements again. Build failures for the
3 problematic architectures and their logging output have again been reported upstream.
diff --git a/eccodes.spec b/eccodes.spec
index 92b920f..ba6d713 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -91,15 +91,15 @@ Obsoletes: grib_api < %{final_grib_api_version}
%endif
# as explained in bugzilla #1562066
-#ExcludeArch: i686
+ExcludeArch: i686
# as explained in bugzilla #1562071
# note: this is no longer part of fc30/rawhide
# but the exclude is still needed for EPEL-7
#ExcludeArch: ppc64
# as explained in bugzilla #1562076
-#ExcludeArch: s390x
+ExcludeArch: s390x
# as explained in bugzilla #1562084
-#ExcludeArch: armv7hl
+ExcludeArch: armv7hl
%if 0%{?rhel} >= 7
# as explained in bugzilla #1629377
@@ -332,17 +332,7 @@ cd build
#LD_LIBRARY_PATH=%%{buildroot}/%%{_libdir} \
#LIBRARY_PATH=%%{buildroot}/%%{_libdir} \
-#ctest3 -V %{?_smp_mflags}
-
-# manually run some problematic tests for s390x:
-echo "================================="
-echo "================================="
-echo "================================="
-echo "output for: ctest -VV -debug -R
\"eccodes_t_bufr_dump_encode_filter|eccodes_t_bufrdc_ref|eccodes_t_bufr_filter|eccodes_t_bufr_ecc-875|eccodes_t_gts_get|eccodes_t_gts_ls|eccodes_t_gts_count|eccodes_t_gts_compare|eccodes_t_metar_ls|eccodes_t_metar_get|eccodes_t_metar_dump|eccodes_t_metar_compare|eccodes_t_grib_sh_ieee64|eccodes_t_grib_lam_bf\""
-echo "================================="
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -debug -R
"eccodes_t_bufr_dump_encode_filter|eccodes_t_bufrdc_ref|eccodes_t_bufr_filter|eccodes_t_bufr_ecc-875|eccodes_t_gts_get|eccodes_t_gts_ls|eccodes_t_gts_count|eccodes_t_gts_compare|eccodes_t_metar_ls|eccodes_t_metar_get|eccodes_t_metar_dump|eccodes_t_metar_compare|eccodes_t_grib_sh_ieee64|eccodes_t_grib_lam_bf"
+ctest3 -V %{?_smp_mflags}
%files
%license LICENSE
commit d0f4b6b6e859287ae62f9c7b26a7d641043daf09
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Jul 27 17:09:04 2019 +0200
add failing tests now to ctest run for i686 and armv7hl
diff --git a/eccodes.spec b/eccodes.spec
index c3ca215..92b920f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -338,11 +338,11 @@ cd build
echo "================================="
echo "================================="
echo "================================="
-echo "output for: ctest -debug -R
\"eccodes_t_ieee|eccodes_t_grib_optimize_scaling_sh\""
+echo "output for: ctest -VV -debug -R
\"eccodes_t_bufr_dump_encode_filter|eccodes_t_bufrdc_ref|eccodes_t_bufr_filter|eccodes_t_bufr_ecc-875|eccodes_t_gts_get|eccodes_t_gts_ls|eccodes_t_gts_count|eccodes_t_gts_compare|eccodes_t_metar_ls|eccodes_t_metar_get|eccodes_t_metar_dump|eccodes_t_metar_compare|eccodes_t_grib_sh_ieee64|eccodes_t_grib_lam_bf\""
echo "================================="
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -VV -debug -R "eccodes_t_ieee|eccodes_t_grib_optimize_scaling_sh"
+ctest -VV -debug -R
"eccodes_t_bufr_dump_encode_filter|eccodes_t_bufrdc_ref|eccodes_t_bufr_filter|eccodes_t_bufr_ecc-875|eccodes_t_gts_get|eccodes_t_gts_ls|eccodes_t_gts_count|eccodes_t_gts_compare|eccodes_t_metar_ls|eccodes_t_metar_get|eccodes_t_metar_dump|eccodes_t_metar_compare|eccodes_t_grib_sh_ieee64|eccodes_t_grib_lam_bf"
%files
%license LICENSE
commit abed06146047623d298eae03f150b60178a899e4
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Jul 27 14:49:56 2019 +0200
added -VV option to ctest
diff --git a/eccodes.spec b/eccodes.spec
index 64ed69f..c3ca215 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -342,7 +342,7 @@ echo "output for: ctest -debug -R
\"eccodes_t_ieee|eccodes_t_grib_optimize_scali
echo "================================="
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -debug -R "eccodes_t_ieee|eccodes_t_grib_optimize_scaling_sh"
+ctest -VV -debug -R "eccodes_t_ieee|eccodes_t_grib_optimize_scaling_sh"
%files
%license LICENSE
commit 3cdc185e1bc1c7bf219af920173203ae35f8001b
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Jul 27 14:35:33 2019 +0200
manually run the 2 failing tests for s390x in debug mode
diff --git a/eccodes.spec b/eccodes.spec
index 1e05371..64ed69f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -332,7 +332,17 @@ cd build
#LD_LIBRARY_PATH=%%{buildroot}/%%{_libdir} \
#LIBRARY_PATH=%%{buildroot}/%%{_libdir} \
-ctest3 -V %{?_smp_mflags}
+#ctest3 -V %{?_smp_mflags}
+
+# manually run some problematic tests for s390x:
+echo "================================="
+echo "================================="
+echo "================================="
+echo "output for: ctest -debug -R
\"eccodes_t_ieee|eccodes_t_grib_optimize_scaling_sh\""
+echo "================================="
+LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
+LIBRARY_PATH=%{buildroot}/%{_libdir} \
+ctest -debug -R "eccodes_t_ieee|eccodes_t_grib_optimize_scaling_sh"
%files
%license LICENSE
commit 1f6d2391b1664de7467f032973dba696fcd45c0a
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Jul 25 23:51:11 2019 +0200
same fix is needed for armv7hl as well.
diff --git a/eccodes.spec b/eccodes.spec
index 440864f..1e05371 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -286,8 +286,8 @@ cp examples/C/*.c %{buildroot}%{_datadir}/doc/%{name}/examples/C
mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/F90
cp examples/F90/*.f90 %{buildroot}%{_datadir}/doc/%{name}/examples/F90
-%ifarch i686
- # pass
+%ifarch i686 armv7hl
+ # pass (nothing to do)
%else
# it seems pkgconfig files end up in lib in stead of lib64 now
# so move them to the right place
commit 14cb429b5877c2e16e4484b9a41b031fc9c234d5
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Jul 25 23:10:24 2019 +0200
exclude i686 from relocating pkgconfig files
diff --git a/eccodes.spec b/eccodes.spec
index 215cb20..440864f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -286,10 +286,14 @@ cp examples/C/*.c %{buildroot}%{_datadir}/doc/%{name}/examples/C
mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/F90
cp examples/F90/*.f90 %{buildroot}%{_datadir}/doc/%{name}/examples/F90
-# it seems pkgconfig files end up in lib in stead of lib64 now
-# so move them to the right place
-mv %{buildroot}/%{_usr}/lib/pkgconfig/ \
- %{buildroot}/%{_libdir}/pkgconfig/
+%ifarch i686
+ # pass
+%else
+ # it seems pkgconfig files end up in lib in stead of lib64 now
+ # so move them to the right place
+ mv %{buildroot}/%{_usr}/lib/pkgconfig/ \
+ %{buildroot}/%{_libdir}/pkgconfig/
+%endif
# It seems the cmake options
# -DCMAKE_SKIP_RPATH=TRUE
commit cf73af9f250677dee8743a9eac25ccfdbc3e4da1
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Jul 25 21:48:56 2019 +0200
update to new upstream version
diff --git a/.gitignore b/.gitignore
index d8581be..d516662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,5 @@
-/eccodes-2.7.0-Source.tar.gz
/eccodes_test_data.tar.gz
-/eccodes-2.7.3-Source.tar.gz
-/eccodes-2.8.0-Source.tar.gz
-/eccodes-2.8.2-Source.tar.gz
-/eccodes-2.9.0-Source.tar.gz
/eccodes_test_data_20181010.tar.gz
-/eccodes-2.9.2-Source.tar.gz
/eccodes-2.12.0-Source.tar.gz
/eccodes-2.12.5-Source.tar.gz
+/eccodes-2.13.0-Source.tar.gz
diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch
index 8786c8f..6161926 100644
--- a/eccodes-32bit.patch
+++ b/eccodes-32bit.patch
@@ -1,5 +1,5 @@
---- eccodes-2.12.5-Source.orig/src/grib_api_prototypes.h 2019-05-09 16:24:38.000000000
+0200
-+++ eccodes-2.12.5-Source/src/grib_api_prototypes.h 2019-05-09 20:11:02.977946707 +0200
+--- eccodes-2.13.0-Source.orig/src/grib_api_prototypes.h 2019-07-08 14:06:45.000000000
+0200
++++ eccodes-2.13.0-Source/src/grib_api_prototypes.h 2019-07-25 12:58:22.124808129 +0200
@@ -872,8 +872,8 @@ double grib_ieeefloat_error(double x);
double grib_long_to_ieee(unsigned long x);
int grib_nearest_smaller_ieee_float(double a, double *x);
@@ -11,8 +11,8 @@
int grib_ieee_decode_array(grib_context *c, unsigned char *buf, size_t nvals, int bytes,
double *val);
int grib_ieee_decode_array(grib_context *c, unsigned char *buf, size_t nvals, int bytes,
double *val);
int grib_ieee_encode_array(grib_context *c, double *val, size_t nvals, int bytes,
unsigned char *buf);
---- eccodes-2.12.5-Source.orig/src/grib_ieeefloat.c 2019-05-09 16:24:38.000000000 +0200
-+++ eccodes-2.12.5-Source/src/grib_ieeefloat.c 2019-05-09 20:11:02.978946681 +0200
+--- eccodes-2.13.0-Source.orig/src/grib_ieeefloat.c 2019-07-08 14:06:45.000000000 +0200
++++ eccodes-2.13.0-Source/src/grib_ieeefloat.c 2019-07-25 12:58:22.125808103 +0200
@@ -392,14 +392,14 @@ unsigned long grib_ieee_to_long(double x
* grib_encode_unsigned_long.
*/
diff --git a/eccodes-fortran-check.patch b/eccodes-fortran-check.patch
deleted file mode 100644
index c2d6892..0000000
--- a/eccodes-fortran-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- eccodes-2.9.2-Source.orig/tests/bufr_dump_encode_fortran.sh 2018-11-09
15:55:26.000000000 +0100
-+++ eccodes-2.9.2-Source/tests/bufr_dump_encode_fortran.sh 2018-11-24 15:07:09.396354719
+0100
-@@ -41,6 +41,7 @@ if command -v pkg-config >/dev/null 2>&1
- INSTALL_DIR=`grep -w CMAKE_INSTALL_PREFIX $CACHE_FILE | cut -d'=' -f2`
- FLAGS_LINKER=`echo $FLAGS_LINKER | sed -e "s:$INSTALL_DIR:$BUILD_DIR:g"`
- FLAGS_COMPILER=`echo $FLAGS_COMPILER | sed -e
"s:$INSTALL_DIR:$BUILD_DIR:g"`
-+ FLAGS_COMPILER="${FLAGS_COMPILER} -I${BUILD_DIR}/include"
-
- # TODO: For now only support when shared libs enabled
- #SHARED_LIBS=`grep -w BUILD_SHARED_LIBS $CACHE_FILE | cut -d'=' -f2`
---- eccodes-2.9.2-Source.orig/tests/bufr_dump_decode_fortran.sh 2018-11-09
15:55:26.000000000 +0100
-+++ eccodes-2.9.2-Source/tests/bufr_dump_decode_fortran.sh 2018-11-24 15:07:09.397354693
+0100
-@@ -41,6 +41,7 @@ if command -v pkg-config >/dev/null 2>&1
- INSTALL_DIR=`grep -w CMAKE_INSTALL_PREFIX $CACHE_FILE | cut -d'=' -f2`
- FLAGS_LINKER=`echo $FLAGS_LINKER | sed -e "s:$INSTALL_DIR:$BUILD_DIR:g"`
- FLAGS_COMPILER=`echo $FLAGS_COMPILER | sed -e
"s:$INSTALL_DIR:$BUILD_DIR:g"`
-+ FLAGS_COMPILER="${FLAGS_COMPILER} -I${BUILD_DIR}/include"
-
- # TODO: For now only support when shared libs enabled
- #SHARED_LIBS=`grep -w BUILD_SHARED_LIBS $CACHE_FILE | cut -d'=' -f2`
diff --git a/eccodes-rpath.patch b/eccodes-rpath.patch
deleted file mode 100644
index a207a84..0000000
--- a/eccodes-rpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- eccodes-2.12.5-Source.orig/cmake/pkg-config.pc.in 2019-05-09 16:24:31.000000000
+0200
-+++ eccodes-2.12.5-Source/cmake/pkg-config.pc.in 2019-05-09 20:11:22.754434973 +0200
-@@ -14,9 +14,7 @@ CC=@CMAKE_C_COMPILER@
- CXX=@CMAKE_CXX_COMPILER@
- FC=@CMAKE_Fortran_COMPILER@
-
--rpath=@RPATH_FLAG@${libdir}
--
--libs=-L${libdir} ${rpath} @PKGCONFIG_LIBS@
-+libs=-L${libdir} @PKGCONFIG_LIBS@
-
- libs_private=@PKGCONFIG_LIBS_PRIVATE@
-
diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch
index 3b1d4d1..5db7e7b 100644
--- a/eccodes-soversion.patch
+++ b/eccodes-soversion.patch
@@ -1,5 +1,5 @@
---- eccodes-2.12.5-Source.orig/fortran/CMakeLists.txt 2019-05-09 16:24:38.000000000
+0200
-+++ eccodes-2.12.5-Source/fortran/CMakeLists.txt 2019-05-09 20:11:14.481649037 +0200
+--- eccodes-2.13.0-Source.orig/fortran/CMakeLists.txt 2019-07-08 14:06:44.000000000
+0200
++++ eccodes-2.13.0-Source/fortran/CMakeLists.txt 2019-07-25 12:58:27.343673693 +0200
@@ -43,7 +43,8 @@ if( HAVE_FORTRAN )
ecbuild_add_library( TARGET eccodes_f90
SOURCES grib_fortran.c grib_f90.f90 eccodes_f90.f90
grib_kinds.h
@@ -10,9 +10,9 @@
add_custom_command( TARGET eccodes_f90 POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/include
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_Fortran_MODULE_DIRECTORY}/${CMAKE_CFG_INTDIR}/eccodes.mod
${CMAKE_BINARY_DIR}/include
---- eccodes-2.12.5-Source.orig/src/CMakeLists.txt 2019-05-09 16:24:38.000000000 +0200
-+++ eccodes-2.12.5-Source/src/CMakeLists.txt 2019-05-09 20:11:14.481649037 +0200
-@@ -436,8 +436,8 @@ ecbuild_add_library(TARGET eccodes
+--- eccodes-2.13.0-Source.orig/src/CMakeLists.txt 2019-07-08 14:06:45.000000000 +0200
++++ eccodes-2.13.0-Source/src/CMakeLists.txt 2019-07-25 12:58:27.343673693 +0200
+@@ -437,8 +437,8 @@ ecbuild_add_library(TARGET eccodes
${grib_api_srcs}
GENERATED grib_api_version.c
LIBS ${ECCODES_EXTRA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
${CMATH_LIBRARIES}
diff --git a/eccodes.spec b/eccodes.spec
index ac9bf8f..215cb20 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,6 +1,6 @@
Name: eccodes
-Version: 2.12.5
-Release: 2%{?dist}
+Version: 2.13.0
+Release: 1%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
@@ -8,11 +8,12 @@ Summary: WMO data format decoding and encoding
%global so_version_f90 0.1
%global datapack_date 20181010
-# latest rawhide grib_api version is 1.27.0-3
+# latest rawhide grib_api version is 1.27.0-4
# 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.27.0 (09-Sep-2018)
-%global final_grib_api_version 1.27.1-1%{?dist}
+# latest upstream grib_api release is 1.28.0 (05-Dec-2018)
+# see
https://confluence.ecmwf.int/display/GRIB/Home
+%global final_grib_api_version 1.28.1-1%{?dist}
%ifarch i686 ppc64 s390x armv7hl
%global obsolete_grib_api 0
@@ -21,8 +22,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.
-# these 2 files:
+# Most of eccodes is licensed ASL 2.0 but a special case must be noted.
+# These 2 files:
# src/grib_yacc.c
# src/grib_yacc.h
# contain a special exception clause that allows them to be
@@ -43,13 +44,6 @@ Patch1: eccodes-32bit.patch
# Add soversion to the shared libraries, since upstream refuses to do so
#
https://software.ecmwf.int/issues/browse/SUP-1809
Patch2: eccodes-soversion.patch
-# remove rpath from cmake/pkg-config.pc.in
-Patch3: eccodes-rpath.patch
-
-# disabled
-# fix compile flags in fortran checks
-# this is needed due to rpath removal
-#Patch4: eccodes-fortran-check.patch
# note that the requests to make the other issues public are filed here:
#
https://software.ecmwf.int/issues/browse/SUP-2073
@@ -63,16 +57,14 @@ BuildRequires: jasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: netcdf-devel
-BuildRequires: numpy
BuildRequires: openjpeg2-devel
-# BuildRequires: python2-devel
# For tests
BuildRequires: perl(Getopt::Long)
BuildRequires: perl(Test::More)
# the data is needed by the library and all tools provided in the main package
-# the other way arpund, the data package could be installed without
+# 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.
@@ -99,15 +91,15 @@ Obsoletes: grib_api < %{final_grib_api_version}
%endif
# as explained in bugzilla #1562066
-ExcludeArch: i686
+#ExcludeArch: i686
# as explained in bugzilla #1562071
# note: this is no longer part of fc30/rawhide
# but the exclude is still needed for EPEL-7
-ExcludeArch: ppc64
+#ExcludeArch: ppc64
# as explained in bugzilla #1562076
-ExcludeArch: s390x
+#ExcludeArch: s390x
# as explained in bugzilla #1562084
-ExcludeArch: armv7hl
+#ExcludeArch: armv7hl
%if 0%{?rhel} >= 7
# as explained in bugzilla #1629377
@@ -124,8 +116,7 @@ in the following formats:
* WMO GTS abbreviated header (only decoding).
A useful set of command line tools provide quick access to the messages. C,
-Fortran 90 and Python (1) interfaces provide access to the main ecCodes
-functionality.
+and Fortran 90 interfaces provide access to the main ecCodes functionality.
ecCodes is an evolution of GRIB-API. It is designed to provide the user with
a simple set of functions to access data from several formats with a key/value
@@ -133,7 +124,7 @@ approach.
For GRIB encoding and decoding, the GRIB-API functionality is provided fully
in ecCodes with only minor interface and behaviour changes. Interfaces for C,
-Fortran 90 and Python (1) are all maintained as in GRIB-API. However, the
+and Fortran 90 are all maintained as in GRIB-API. However, the
GRIB-API Fortran 77 interface is no longer available.
In addition, a new set of functions with the prefix "codes_" is provided to
@@ -148,10 +139,6 @@ and behaviour. A significant difference compared with GRIB-API tools
is that
bufr_dump produces output in JSON format suitable for many web based
applications.
-(1) Note: the python3 interface is provided by upstream,
-but it fails unit testing, so it has been disabled for now.
-As soon as this is fixed by upstream it will be added here.
-
#####################################################
%package devel
Summary: Contains ecCodes development files
@@ -168,23 +155,6 @@ Obsoletes: grib_api-devel < %{final_grib_api_version}
Header files and libraries for ecCodes.
#####################################################
-#%%package -n python2-%%{name}
-#Summary: A python2 interface to ecCodes
-#Requires: %%{name}%%{?_isa} = %%{version}-%%{release}
-#Requires: gcc-gfortran%%{?_isa}
-#Requires: jasper-devel%%{?_isa}
-#
-## a sub package python2-grib_api did not exist
-## so no obsoletes needed here
-#
-#%%description -n python2-%%{name}
-#A python2 interface to ecCodes. Also a legacy interface to gribapi is provided.
-
-#####################################################
-# note: python3 is not yet supported by eccodes
-# but upstream intents to make it available before the end of 2018
-
-#####################################################
%package data
Summary: Data needed by the eccodes library and tools
BuildArch: noarch
@@ -206,11 +176,7 @@ BuildArch: noarch
%description doc
This package contains the html documentation for ecCodes
and a fair number of example programs and scripts to use it
-in C, Fortran 90, and Python (1).
-
-(1) Note: the python3 interface is provided by upstream,
-but it fails unittesting, so it has been disabled for now.
-As soon as this is fixed by upstream it will be added here.
+in C, and Fortran 90.
#####################################################
%prep
@@ -246,25 +212,42 @@ cd build
# * ECCODES_OMP_THREADS , enable OMP threads
# * EXTRA_TESTS , enable extended regression testing
#
+#-- The following features are set to AUTO by default and
+# explicitely switched on to ensure they don't vanish unnoticed
+# in case of dependency problems during the build:
+# * ENABLE_JPG
+# ^ ENABLE_FORTRAN
+# * ENABLE_NETCDF
+# NetCDF is only needed to create the grib_to_netcdf convert tool
+#
+# * ENABLE_PYTHON has value AUTO as default, so if python2 is available
+# during a package build it will build an interface for it.
+# To make sure it does not do so, explicitely switch it off.
+# Python3 support has been moved to an additional project now,
+# so python handling has been removed completely from this spec file.
+#
#-- Also add an explicit option to not use rpath
#
# Note: -DINSTALL_LIB_DIR=%%{_lib} is needed because otherwise
# the library so files get installed in /usr/lib in stead
# of /usr/lib64 on x86_64.
-# Note: -DPYTHON_EXECUTABLE was added to prevent deprecation warnings
-# during running of tests which breaks
-# Test #184: eccodes_p_grib_keys_iterator_test
%cmake3 -DINSTALL_LIB_DIR=%{_lib} \
-DENABLE_ECCODES_OMP_THREADS=ON \
-DENABLE_EXTRA_TESTS=ON \
+ -DENABLE_JPG=ON \
-DENABLE_PNG=ON \
- -DCMAKE_SKIP_RPATH=TRUE \
+ -DENABLE_FORTRAN=ON \
+ -DENABLE_NETCDF=ON \
+ -DCMAKE_SKIP_INSTALL_RPATH=TRUE \
-DECCODES_SOVERSION=%{so_version} \
-DECCODES_SOVERSION_F90=%{so_version_f90} \
-DENABLE_PYTHON=OFF \
..
-# -DPYTHON_EXECUTABLE=%%{_bindir}/python2 \
+# note:
+# with -DCMAKE_SKIP_RPATH=TRUE
+# LD_LIBRARY_PATH and #LIBRARY_PATH need to be defined before running ctest.
+# with -DCMAKE_SKIP_INSTALL_RPATH=TRUE this seems not needed
%make_build
@@ -302,19 +285,23 @@ mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/C
cp examples/C/*.c %{buildroot}%{_datadir}/doc/%{name}/examples/C
mkdir -p %{buildroot}%{_datadir}/doc/%{name}/examples/F90
cp examples/F90/*.f90 %{buildroot}%{_datadir}/doc/%{name}/examples/F90
-#mkdir -p %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python
-#cp examples/python/*.py %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python
-#cp examples/python/*.c %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python
-#cp examples/python/*.csv %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python
-
-# adapt a shebang to make it point explicitely to python2
-#sed -i -e 's/\/bin\/env python/\/usr\/bin\/python2/' \
-# %%{buildroot}%%{_datadir}/doc/%%{name}/examples/python/high_level_api.py
-# move cmake files to the cmake folder below libdir
-# as suggested in the review request
-mkdir -p %{buildroot}%{_libdir}/cmake/%{name}/
-mv %{buildroot}%{_datadir}/%{name}/cmake/* %{buildroot}%{_libdir}/cmake/%{name}/
+# it seems pkgconfig files end up in lib in stead of lib64 now
+# so move them to the right place
+mv %{buildroot}/%{_usr}/lib/pkgconfig/ \
+ %{buildroot}/%{_libdir}/pkgconfig/
+
+# It seems the cmake options
+# -DCMAKE_SKIP_RPATH=TRUE
+# -DCMAKE_SKIP_INSTALL_RPATH=TRUE
+# have no effect on the generated *.pc files.
+# These still contain an rpath reference, so patch them and remove
+# the rpath using sed
+for pcfile in %{buildroot}/%{_libdir}/pkgconfig/*.pc ; do \
+ mv $pcfile $pcfile.orig; \
+ cat $pcfile.orig | sed 's|,-rpath,|,|g' > $pcfile ; \
+ rm $pcfile.orig; \
+done
%ldconfig_scriptlets
@@ -337,8 +324,10 @@ cd build
# so a patch has been added to solve this for now.
# See:
https://software.ecmwf.int/issues/browse/SUP-1812
# (unfortunately this issue is not public)
-LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
-LIBRARY_PATH=%{buildroot}/%{_libdir} \
+
+#LD_LIBRARY_PATH=%%{buildroot}/%%{_libdir} \
+#LIBRARY_PATH=%%{buildroot}/%%{_libdir} \
+
ctest3 -V %{?_smp_mflags}
%files
@@ -347,11 +336,6 @@ ctest3 -V %{?_smp_mflags}
%{_bindir}/*
%{_libdir}/*.so.*
-#%%files -n python2-%%{name}
-#%%{python2_sitearch}/%%{name}
-#%%{python2_sitearch}/%%{name}-*-py*.egg-info
-#%%{python2_sitearch}/gribapi
-
%files devel
%{_includedir}/*
%{_fmoddir}/%{name}.mod
@@ -372,6 +356,9 @@ ctest3 -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
+* Thu Jul 25 2019 Jos de Kloe <josdekloe(a)gmail.com> - 2.13.0-1
+- Upgrade to upstream version 2.13.0
+
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.5-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index c71b38e..0f7be28 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
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
commit 88c16b9609257a087214562df2ade0b3b6da1dc4
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 24 22:57:43 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/eccodes.spec b/eccodes.spec
index b5c6f42..ac9bf8f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,6 +1,6 @@
Name: eccodes
Version: 2.12.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
@@ -372,6 +372,9 @@ ctest3 -V %{?_smp_mflags}
%doc %{_datadir}/doc/%{name}/
%changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.12.5-2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Thu May 09 2019 Jos de Kloe <josdekloe(a)gmail.com> - 2.12.5-1
- Upgrade to upstream version 2.12.5