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=31b4a19ff7452... https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=8b7d65f555e59....
Change: -ExcludeArch: armv7hl +ExcludeArch: armv7hl
Thanks.
Full change: ============
commit bbea12307ac0918a80b5924c5a3245973941b6c8 Merge: df047ba a745473 Author: Jos de Kloe josdekloe@gmail.com Date: Sun Jan 24 11:12:59 2021 +0100
Merge branch 'master' into f32
commit a7454734af6188edea24ae4a92887aa6e7ce4021 Author: Jos de Kloe josdekloe@gmail.com Date: Sat Jan 23 19:40:01 2021 +0100
Upgrade to upstream version 2.20.0
diff --git a/.gitignore b/.gitignore index 441be1d..293c67f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /eccodes_test_data_20200626.tar.gz /eccodes-2.19.0-Source.tar.gz /eccodes-2.19.1-Source.tar.gz +/eccodes-2.20.0-Source.tar.gz diff --git a/eccodes-soversion.patch b/eccodes-soversion.patch index cad10e0..99fb837 100644 --- a/eccodes-soversion.patch +++ b/eccodes-soversion.patch @@ -1,5 +1,5 @@ ---- eccodes-2.19.0-Source.unchanged/fortran/CMakeLists.txt 2020-10-15 13:21:34.000000000 +0200 -+++ eccodes-2.19.0-Source/fortran/CMakeLists.txt 2020-10-16 09:07:21.570272038 +0200 +--- 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 @@ -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.19.0-Source.unchanged/src/CMakeLists.txt 2020-10-15 13:21:34.000000000 +0200 -+++ eccodes-2.19.0-Source/src/CMakeLists.txt 2020-10-16 08:52:43.447698207 +0200 +--- 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 @@ -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 4edd02c..7d7f51c 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.19.1 +Version: 2.20.0 Release: 1%{?dist} Summary: WMO data format decoding and encoding
@@ -354,6 +354,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/
%changelog +* Sat Jan 23 2021 Jos de Kloe josdekloe@gmail.com - 2.20.0-1 +- Upgrade to upstream version 2.20.0 + * Fri Nov 13 2020 Jos de Kloe josdekloe@gmail.com - 2.19.1-1 - Upgrade to upstream version 2.19.1
diff --git a/sources b/sources index 1f3e7fa..316ee13 100644 --- a/sources +++ b/sources @@ -10,3 +10,4 @@ SHA512 (eccodes-2.18.0-Source.tar.gz) = 8daf7f2e1aed055ca6402881f5473e4ae90ba24c 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
commit 486346bf6ee0d47e14baa2b66569af9eb9e313f9 Author: Jos de Kloe josdekloe@gmail.com Date: Fri Nov 13 17:12:29 2020 +0100
Upgrade to upstream version 2.19.1
diff --git a/.gitignore b/.gitignore index 5a45cb1..441be1d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /eccodes-2.18.0-Source.tar.gz /eccodes_test_data_20200626.tar.gz /eccodes-2.19.0-Source.tar.gz +/eccodes-2.19.1-Source.tar.gz diff --git a/eccodes.spec b/eccodes.spec index f6abf99..4edd02c 100644 --- a/eccodes.spec +++ b/eccodes.spec @@ -1,5 +1,5 @@ Name: eccodes -Version: 2.19.0 +Version: 2.19.1 Release: 1%{?dist} Summary: WMO data format decoding and encoding
@@ -354,6 +354,9 @@ ctest3 -V %{?_smp_mflags} %doc %{_datadir}/doc/%{name}/
%changelog +* Fri Nov 13 2020 Jos de Kloe josdekloe@gmail.com - 2.19.1-1 +- Upgrade to upstream version 2.19.1 + * Sat Oct 17 2020 Jos de Kloe josdekloe@gmail.com - 2.19.0-1 - Upgrade to upstream version 2.19.0 and remove patch 1 - Add -fpic to the fortran flags (needed for compiling on armv7hl) diff --git a/sources b/sources index 6a0df4e..1f3e7fa 100644 --- a/sources +++ b/sources @@ -9,3 +9,4 @@ SHA512 (eccodes-2.17.0-Source.tar.gz) = 362c6ae23c23326a3a969c6ba109bdf96ba449cb 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
commit 31b4a19ff74524c79b505f2f20437e84eb2dd044 Author: Jos de Kloe josdekloe@gmail.com Date: Sun Oct 18 20:13:18 2020 +0200
remove 2 files that I added by mistake (that's what you get if upstream decides to rename the python module to have exactly the same name as the c library itself).
diff --git a/python-eccodes-bufrtests.patch b/python-eccodes-bufrtests.patch deleted file mode 100644 index 6f90a67..0000000 --- a/python-eccodes-bufrtests.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- eccodes-0.9.9.unchanged/tests/test_eccodes.py 2020-08-03 15:12:30.000000000 +0200 -+++ eccodes-0.9.9/tests/test_eccodes.py 2020-10-18 19:52:10.369784597 +0200 -@@ -537,7 +537,7 @@ def test_bufr_keys_iterator(): - keyname = codes_bufr_keys_iterator_get_name(iterid) - assert "#" not in keyname - count += 1 -- assert count == 53 -+ assert count == 54 - - codes_set(bid, "unpack", 1) - codes_bufr_keys_iterator_rewind(iterid) -@@ -545,7 +545,7 @@ def test_bufr_keys_iterator(): - while codes_bufr_keys_iterator_next(iterid): - keyname = codes_bufr_keys_iterator_get_name(iterid) - count += 1 -- assert count == 156 -+ assert count == 157 - codes_bufr_keys_iterator_rewind(iterid) - codes_bufr_keys_iterator_delete(iterid) - codes_release(bid) diff --git a/python-eccodes.spec b/python-eccodes.spec deleted file mode 100644 index 3bb6382..0000000 --- a/python-eccodes.spec +++ /dev/null @@ -1,97 +0,0 @@ -Name: python-eccodes -Version: 0.9.9 -Release: 1%{?dist} -Summary: Python interface to the ecCodes GRIB and BUFR decoder/encoder -License: ASL 2.0 -# note: upstream has changed the name on pypi from eccodes-python to eccodes -URL: https://pypi.org/project/eccodes/ -Source0: https://files.pythonhosted.org/packages/source/e/eccodes/eccodes-%%7Bversion... -# see https://github.com/ecmwf/eccodes-python/pull/21 -Patch1: python-eccodes-setup.patch -# see https://github.com/ecmwf/eccodes-python/issues/36 -Patch2: python-eccodes-sphinx-config.patch -# see https://github.com/ecmwf/eccodes-python/issues/37 -# this patch is needed for eccodes2.19.0 (not for eccodes 2.18.0) -Patch3: python-eccodes-bufrtests.patch - -# note that the fast bindings are arch dependent -BuildRequires: eccodes-devel -BuildRequires: python3-devel -BuildRequires: python3-setuptools -# needed to build the fast bindings -BuildRequires: python3-cffi -# needed for checks/tests -BuildRequires: python3-pytest -BuildRequires: python3-numpy -# these next 2 seem not actually used, although they are mentioned as -# test dependencies in the setup.py file: -#BuildRequires: python3-pytest-cov -#BuildRequires: python3-pytest-flakes - -# needed to build the documentation -BuildRequires: python3-sphinx - -# dont try to build for architectures for which the main -# ecccodes library cannot yet be build - -# as explained in bugzilla #1562066 -ExcludeArch: i686 -# as explained in bugzilla #1562076 -ExcludeArch: s390x -# as explained in bugzilla #1562084 -ExcludeArch: armv7hl - - -%global _description \ -Python 3 interface to encode and decode GRIB and BUFR files via the \ -ECMWF ecCodes library. It allows reading and writing of GRIB 1 and 2 \ -files and BUFR 3 and 4 files. - -%description %_description - -%package -n python3-eccodes -Summary: %summary - -%{?python_provide:%python_provide python3-eccodes} - -%description -n python3-eccodes %_description - -%prep -%autosetup -n eccodes-%{version} -p1 - -%build -%py3_build -# buld documentation -%{__python3} setup.py build_sphinx -# remove generated sphinx files that are not part of the actual documentation -rm build/sphinx/html/.buildinfo - -%install -%py3_install - -# remove *.h files that do not belong in a python module directory -rm %{buildroot}%{python3_sitearch}/gribapi/*.h - -%check -%{__python3} -m eccodes selfcheck -%{__python3} -m pytest -v - -%files -n python3-eccodes -%doc README.rst -%doc build/sphinx/html/ -%license LICENSE -%{python3_sitearch}/eccodes-*-py*.egg-info -%{python3_sitearch}/eccodes -%{python3_sitearch}/gribapi - - -%changelog -* Sun Oct 18 2020 Jos de Kloe josdekloe@gmail.com 0.9.9-1 -- new upstream version, and adapt to upstream project name change -- add patch for sphinx configuration problem -- add patch to fix test run for eccodes 2.19.0 -* Sat Jul 04 2020 Jos de Kloe josdekloe@gmail.com 0.9.8-1 -- new upstream version -* Thu Mar 19 2020 Jos de Kloe josdekloe@gmail.com 0.9.7-1 -- First version for Fedora, based on a spec file contributed by - Emanuele Di Giacomo and Daniele Branchini.
commit 8b7d65f555e592196f1b3774ea09aebb6114baaa Author: Jos de Kloe josdekloe@gmail.com Date: Sun Oct 18 20:04:43 2020 +0200
add patch to fix test run for eccodes 2.19.0
diff --git a/python-eccodes-bufrtests.patch b/python-eccodes-bufrtests.patch new file mode 100644 index 0000000..6f90a67 --- /dev/null +++ b/python-eccodes-bufrtests.patch @@ -0,0 +1,20 @@ +--- eccodes-0.9.9.unchanged/tests/test_eccodes.py 2020-08-03 15:12:30.000000000 +0200 ++++ eccodes-0.9.9/tests/test_eccodes.py 2020-10-18 19:52:10.369784597 +0200 +@@ -537,7 +537,7 @@ def test_bufr_keys_iterator(): + keyname = codes_bufr_keys_iterator_get_name(iterid) + assert "#" not in keyname + count += 1 +- assert count == 53 ++ assert count == 54 + + codes_set(bid, "unpack", 1) + codes_bufr_keys_iterator_rewind(iterid) +@@ -545,7 +545,7 @@ def test_bufr_keys_iterator(): + while codes_bufr_keys_iterator_next(iterid): + keyname = codes_bufr_keys_iterator_get_name(iterid) + count += 1 +- assert count == 156 ++ assert count == 157 + codes_bufr_keys_iterator_rewind(iterid) + codes_bufr_keys_iterator_delete(iterid) + codes_release(bid) diff --git a/python-eccodes.spec b/python-eccodes.spec new file mode 100644 index 0000000..3bb6382 --- /dev/null +++ b/python-eccodes.spec @@ -0,0 +1,97 @@ +Name: python-eccodes +Version: 0.9.9 +Release: 1%{?dist} +Summary: Python interface to the ecCodes GRIB and BUFR decoder/encoder +License: ASL 2.0 +# note: upstream has changed the name on pypi from eccodes-python to eccodes +URL: https://pypi.org/project/eccodes/ +Source0: https://files.pythonhosted.org/packages/source/e/eccodes/eccodes-%%7Bversion... +# see https://github.com/ecmwf/eccodes-python/pull/21 +Patch1: python-eccodes-setup.patch +# see https://github.com/ecmwf/eccodes-python/issues/36 +Patch2: python-eccodes-sphinx-config.patch +# see https://github.com/ecmwf/eccodes-python/issues/37 +# this patch is needed for eccodes2.19.0 (not for eccodes 2.18.0) +Patch3: python-eccodes-bufrtests.patch + +# note that the fast bindings are arch dependent +BuildRequires: eccodes-devel +BuildRequires: python3-devel +BuildRequires: python3-setuptools +# needed to build the fast bindings +BuildRequires: python3-cffi +# needed for checks/tests +BuildRequires: python3-pytest +BuildRequires: python3-numpy +# these next 2 seem not actually used, although they are mentioned as +# test dependencies in the setup.py file: +#BuildRequires: python3-pytest-cov +#BuildRequires: python3-pytest-flakes + +# needed to build the documentation +BuildRequires: python3-sphinx + +# dont try to build for architectures for which the main +# ecccodes library cannot yet be build + +# as explained in bugzilla #1562066 +ExcludeArch: i686 +# as explained in bugzilla #1562076 +ExcludeArch: s390x +# as explained in bugzilla #1562084 +ExcludeArch: armv7hl + + +%global _description \ +Python 3 interface to encode and decode GRIB and BUFR files via the \ +ECMWF ecCodes library. It allows reading and writing of GRIB 1 and 2 \ +files and BUFR 3 and 4 files. + +%description %_description + +%package -n python3-eccodes +Summary: %summary + +%{?python_provide:%python_provide python3-eccodes} + +%description -n python3-eccodes %_description + +%prep +%autosetup -n eccodes-%{version} -p1 + +%build +%py3_build +# buld documentation +%{__python3} setup.py build_sphinx +# remove generated sphinx files that are not part of the actual documentation +rm build/sphinx/html/.buildinfo + +%install +%py3_install + +# remove *.h files that do not belong in a python module directory +rm %{buildroot}%{python3_sitearch}/gribapi/*.h + +%check +%{__python3} -m eccodes selfcheck +%{__python3} -m pytest -v + +%files -n python3-eccodes +%doc README.rst +%doc build/sphinx/html/ +%license LICENSE +%{python3_sitearch}/eccodes-*-py*.egg-info +%{python3_sitearch}/eccodes +%{python3_sitearch}/gribapi + + +%changelog +* Sun Oct 18 2020 Jos de Kloe josdekloe@gmail.com 0.9.9-1 +- new upstream version, and adapt to upstream project name change +- add patch for sphinx configuration problem +- add patch to fix test run for eccodes 2.19.0 +* Sat Jul 04 2020 Jos de Kloe josdekloe@gmail.com 0.9.8-1 +- new upstream version +* Thu Mar 19 2020 Jos de Kloe josdekloe@gmail.com 0.9.7-1 +- First version for Fedora, based on a spec file contributed by + Emanuele Di Giacomo and Daniele Branchini.
arch-excludes@lists.fedoraproject.org