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=797fa5158c...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=67628b1983...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=59ad77e599...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=76b0b8d3f8...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=43bec0d8e7...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=5c68a9b619...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=ea19539846...
https://src.fedoraproject.org/cgit/rpms/eccodes.git/commit/?id=2d44599987....
Change:
+ExcludeArch: armv7hl
-ExcludeArch: armv7hl
+ExcludeArch: armv7hl
-ExcludeArch: armv7hl
-%ifarch aarch64
+ExcludeArch: aarch64
-ExcludeArch: armv7hl
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 2d44599987576ddc258e903a600e18cf0a0d615a
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Nov 24 17:42:49 2018 +0100
add the ExcludeArch statements again, they are still needed
diff --git a/eccodes.spec b/eccodes.spec
index 90baa50..adf3704 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -88,15 +88,15 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# 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
commit 67628b19831e5a98f4cfa5c2a61f674072b83b7a
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Nov 24 17:20:39 2018 +0100
update to new upstream version, and remove ExcludeArch statements for testing
diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch
index 25cdda3..76fbedf 100644
--- a/eccodes-32bit.patch
+++ b/eccodes-32bit.patch
@@ -1,6 +1,6 @@
---- eccodes-2.9.0-Source.orig/src/grib_api_prototypes.h 2018-09-27 15:34:35.000000000
+0200
-+++ eccodes-2.9.0-Source/src/grib_api_prototypes.h 2018-10-07 14:26:19.551765319 +0200
-@@ -870,8 +870,8 @@ double grib_ieeefloat_error(double x);
+--- eccodes-2.9.2-Source.orig/src/grib_api_prototypes.h 2018-11-09 15:55:26.000000000
+0100
++++ eccodes-2.9.2-Source/src/grib_api_prototypes.h 2018-11-24 15:06:47.892920252 +0100
+@@ -869,8 +869,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);
unsigned long grib_ieee_to_long(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.9.0-Source.orig/src/grib_ieeefloat.c 2018-09-27 15:34:35.000000000 +0200
-+++ eccodes-2.9.0-Source/src/grib_ieeefloat.c 2018-10-07 14:26:19.553765269 +0200
+--- eccodes-2.9.2-Source.orig/src/grib_ieeefloat.c 2018-11-09 15:55:26.000000000 +0100
++++ eccodes-2.9.2-Source/src/grib_ieeefloat.c 2018-11-24 15:06:47.892920252 +0100
@@ -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
index 96ff5e4..c2d6892 100644
--- a/eccodes-fortran-check.patch
+++ b/eccodes-fortran-check.patch
@@ -1,5 +1,5 @@
---- eccodes-2.7.0-Source.orig/tests/bufr_dump_encode_fortran.sh 2018-03-02
10:52:20.000000000 +0100
-+++ eccodes-2.7.0-Source/tests/bufr_dump_encode_fortran.sh 2018-03-10 10:16:43.857822252
+0100
+--- 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"`
@@ -7,9 +7,9 @@
+ 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.7.0-Source.orig/tests/bufr_dump_decode_fortran.sh 2018-03-02
10:52:20.000000000 +0100
-+++ eccodes-2.7.0-Source/tests/bufr_dump_decode_fortran.sh 2018-03-10 10:16:43.857822252
+0100
+ #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"`
@@ -17,4 +17,4 @@
+ 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`
+ #SHARED_LIBS=`grep -w BUILD_SHARED_LIBS $CACHE_FILE | cut -d'=' -f2`
diff --git a/eccodes.spec b/eccodes.spec
index 0fca661..90baa50 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,5 +1,5 @@
Name: eccodes
-Version: 2.9.0
+Version: 2.9.2
Release: 1%{?dist}
Summary: WMO data format decoding and encoding
@@ -88,15 +88,15 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# 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
@@ -363,6 +363,9 @@ ctest3 -V %{?_smp_mflags}
%changelog
+* Sat Nov 24 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.9.2-1
+- Upgrade to upstream version 2.9.2
+
* Sun Oct 7 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.9.0-1
- Upgrade to upstream version 2.9.0
commit 8a814362ca97350e77928bdb8d5648085d4f6e68
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Nov 24 17:15:59 2018 +0100
new sources for release 2.9.2
diff --git a/.gitignore b/.gitignore
index 91716f8..ffbff0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/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
diff --git a/sources b/sources
index 960e39b..7b2c40f 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ SHA512 (eccodes-2.8.2-Source.tar.gz) =
942de24390df9de64a768e2f351c9acef5b0550a5
SHA512 (eccodes_test_data.tar.gz) =
0f13137584525f12e184068501cc13a58fb8bb16ada680ca7f1575c6066fd2bc5995ec7afffb175c38958e71d991cea4b3972ad01402b54d2550e442241ffc7b
SHA512 (eccodes-2.9.0-Source.tar.gz) =
c485255d85d78600fbb4828d9d6eaf2e03a425b7eb8fe5cb1a5f5f822df8b830eddeaa06013327ca1f7247b0012e1ee78814a164a5ccf4b1e90c1a62a35431ea
SHA512 (eccodes_test_data_20181010.tar.gz) =
24c24ec9e01d230cf542abe5c131f05b8e627dd9d170c666628bb5fd8f7b1a6aa11a35456b8d742c59f54c6aabac78658efd68b0c50779d466aba3d35b4a0231
+SHA512 (eccodes-2.9.2-Source.tar.gz) =
94d077bb0f348c4d64883a4f0877439c123786c73d2b64e4bdfb3f7eb28e445ff1e0eeb57140261906b8aef8e22fd3d614528f1821877ebe6bcb9d38393921d9
commit 59ad77e5991b6e774f48278bdfe45bb6d5bb6692
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed Oct 10 21:23:25 2018 +0200
enable ExcludeArch again
diff --git a/eccodes.spec b/eccodes.spec
index d1ef81f..0fca661 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -87,16 +87,16 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
-## as explained in bugzilla #1562066
-#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
-## as explained in bugzilla #1562084
-#ExcludeArch: armv7hl
+# as explained in bugzilla #1562066
+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
+# as explained in bugzilla #1562084
+ExcludeArch: armv7hl
%if 0%{?rhel} >= 7
# as explained in bugzilla #1629377
commit ea19539846690cb1176795769b8529ce9389532a
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed Oct 10 20:16:16 2018 +0200
disable ExcludeArch for fedora testing
diff --git a/eccodes.spec b/eccodes.spec
index 0fca661..d1ef81f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -87,16 +87,16 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
-# as explained in bugzilla #1562066
-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
-# as explained in bugzilla #1562084
-ExcludeArch: armv7hl
+## as explained in bugzilla #1562066
+#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
+## as explained in bugzilla #1562084
+#ExcludeArch: armv7hl
%if 0%{?rhel} >= 7
# as explained in bugzilla #1629377
commit a5ffadf6c3d404bad5191a85b26925bd75b117cf
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed Oct 10 20:15:18 2018 +0200
update to new upstream version
diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch
index 4ef204e..25cdda3 100644
--- a/eccodes-32bit.patch
+++ b/eccodes-32bit.patch
@@ -1,6 +1,6 @@
---- eccodes-2.8.2-Source.orig/src/grib_api_prototypes.h 2018-08-06 11:45:33.000000000
+0200
-+++ eccodes-2.8.2-Source/src/grib_api_prototypes.h 2018-09-09 12:06:18.628509429 +0200
-@@ -871,8 +871,8 @@ double grib_ieeefloat_error(double x);
+--- eccodes-2.9.0-Source.orig/src/grib_api_prototypes.h 2018-09-27 15:34:35.000000000
+0200
++++ eccodes-2.9.0-Source/src/grib_api_prototypes.h 2018-10-07 14:26:19.551765319 +0200
+@@ -870,8 +870,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);
unsigned long grib_ieee_to_long(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.8.2-Source.orig/src/grib_ieeefloat.c 2018-08-06 11:45:33.000000000 +0200
-+++ eccodes-2.8.2-Source/src/grib_ieeefloat.c 2018-09-09 12:06:18.628509429 +0200
+--- eccodes-2.9.0-Source.orig/src/grib_ieeefloat.c 2018-09-27 15:34:35.000000000 +0200
++++ eccodes-2.9.0-Source/src/grib_ieeefloat.c 2018-10-07 14:26:19.553765269 +0200
@@ -392,14 +392,14 @@ unsigned long grib_ieee_to_long(double x
* grib_encode_unsigned_long.
*/
diff --git a/eccodes.spec b/eccodes.spec
index 483b989..0fca661 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,18 +1,18 @@
Name: eccodes
-Version: 2.8.2
-Release: 4%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
%global so_version 0.1
%global so_version_f90 0.1
-%global datapack_date 20180705
+%global datapack_date 20181010
-# latest rawhide grib_api version is 1.27.0-1
+# latest rawhide grib_api version is 1.27.0-2
# 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.0-1
+%global final_grib_api_version 1.27.0-2
# license remarks:
# most of eccodes is licensed ASL 2.0 but a special case must be noted.
@@ -27,11 +27,9 @@ License: ASL 2.0
URL:
https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
Source0:
https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-%{v...
# note: this data package is unversioned upstream but still it is updated
-# now and then. The current copy was downloaded 05-Jul-2018
-# todo: rename the datapack using the download date to make it versioned
-# in fedora and figure out how to insert this in this Source1 entry
-# (next time it changes)
-Source1:
http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz
+# now and then so rename the datapack using the download date
+# to make it versioned in fedora
+Source1:
http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz#/ecc...
# Support 32-bit
#
https://software.ecmwf.int/issues/browse/SUP-1813
# (unfortunately this issue is not public)
@@ -365,6 +363,9 @@ ctest3 -V %{?_smp_mflags}
%changelog
+* Sun Oct 7 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.9.0-1
+- Upgrade to upstream version 2.9.0
+
* Sat Sep 15 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.2-4
- add Excludearch for aarch64 on epel7
commit 5cb37b9fd3a12d09c303add8802d090c9f2c7b96
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Wed Oct 10 20:13:56 2018 +0200
upload new sources
diff --git a/.gitignore b/.gitignore
index 1517312..91716f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
/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
diff --git a/sources b/sources
index aabef93..960e39b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,4 @@
SHA512 (eccodes-2.8.2-Source.tar.gz) =
942de24390df9de64a768e2f351c9acef5b0550a59695016b9753b22fbff260f8a6f9780240dbb2402bec372ee4c8224a68f3d70699a5df42b23c0a4c073114d
SHA512 (eccodes_test_data.tar.gz) =
0f13137584525f12e184068501cc13a58fb8bb16ada680ca7f1575c6066fd2bc5995ec7afffb175c38958e71d991cea4b3972ad01402b54d2550e442241ffc7b
+SHA512 (eccodes-2.9.0-Source.tar.gz) =
c485255d85d78600fbb4828d9d6eaf2e03a425b7eb8fe5cb1a5f5f822df8b830eddeaa06013327ca1f7247b0012e1ee78814a164a5ccf4b1e90c1a62a35431ea
+SHA512 (eccodes_test_data_20181010.tar.gz) =
24c24ec9e01d230cf542abe5c131f05b8e627dd9d170c666628bb5fd8f7b1a6aa11a35456b8d742c59f54c6aabac78658efd68b0c50779d466aba3d35b4a0231
commit 43bec0d8e72f3a6853175f889b46d65a40d395f0
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Sep 15 17:02:21 2018 +0200
remove one layer of it-then
diff --git a/eccodes.spec b/eccodes.spec
index 9681385..483b989 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -101,11 +101,9 @@ ExcludeArch: s390x
ExcludeArch: armv7hl
%if 0%{?rhel} >= 7
-%ifarch aarch64
# as explained in bugzilla #1629377
ExcludeArch: aarch64
%endif
-%endif
%description
ecCodes is a package developed by ECMWF which provides an application
commit 5784bcd6ba03ca206db4f7fce76e372531c9995f
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Sep 15 16:15:35 2018 +0200
add Excludearch for aarch64 on epel7
diff --git a/eccodes.spec b/eccodes.spec
index 2536851..9681385 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,6 +1,6 @@
Name: eccodes
Version: 2.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
@@ -367,6 +367,9 @@ ctest3 -V %{?_smp_mflags}
%changelog
+* Sat Sep 15 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.2-4
+- add Excludearch for aarch64 on epel7
+
* Sat Sep 15 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.2-3
- Explicitely disable python in cmake call and use ctest3 rather than ctest
to ensure the build runs on EPEL-7 as well
commit 5c68a9b619e0f52769afe6920bdde306429bda67
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Sep 15 16:12:18 2018 +0200
add ExcludeArch: aarch64 since the build fails for that one
diff --git a/eccodes.spec b/eccodes.spec
index da8790f..2536851 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -93,12 +93,20 @@ Obsoletes: grib_api < %{final_grib_api_version}
ExcludeArch: i686
# as explained in bugzilla #1562071
# note: this is no longer part of fc30/rawhide
-#ExcludeArch: ppc64
+# but the exclude is still needed for EPEL-7
+ExcludeArch: ppc64
# as explained in bugzilla #1562076
ExcludeArch: s390x
# as explained in bugzilla #1562084
ExcludeArch: armv7hl
+%if 0%{?rhel} >= 7
+%ifarch aarch64
+# as explained in bugzilla #1629377
+ExcludeArch: aarch64
+%endif
+%endif
+
%description
ecCodes is a package developed by ECMWF which provides an application
programming interface and a set of tools for decoding and encoding messages
commit 2c01a295cd80213e78a103094f78191da4380eaf
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sat Sep 15 15:18:41 2018 +0200
ensure the build runs on EPEL-7 as well
diff --git a/eccodes.spec b/eccodes.spec
index b57131b..da8790f 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,6 +1,6 @@
Name: eccodes
Version: 2.8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
@@ -248,6 +248,7 @@ cd build
-DCMAKE_SKIP_RPATH=TRUE \
-DECCODES_SOVERSION=%{so_version} \
-DECCODES_SOVERSION_F90=%{so_version_f90} \
+ -DENABLE_PYTHON=OFF \
..
# -DPYTHON_EXECUTABLE=%%{_bindir}/python2 \
@@ -324,7 +325,7 @@ cd build
# (unfortunately this issue is not public)
LD_LIBRARY_PATH=%{buildroot}/%{_libdir} \
LIBRARY_PATH=%{buildroot}/%{_libdir} \
-ctest -V %{?_smp_mflags}
+ctest3 -V %{?_smp_mflags}
%files
%license LICENSE
@@ -358,6 +359,10 @@ ctest -V %{?_smp_mflags}
%changelog
+* Sat Sep 15 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.2-3
+- Explicitely disable python in cmake call and use ctest3 rather than ctest
+ to ensure the build runs on EPEL-7 as well
+
* Thu Sep 13 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.2-2
- Remove python2 sub-package as per Mass Python 2 Package Removal for f30
commit 8f44920b9d2c87396d2fed54e3f673ae41cbad2f
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Thu Sep 13 11:20:05 2018 +0200
Remove python2 sub-package as per Mass Python 2 Package Removal for f30
diff --git a/eccodes.spec b/eccodes.spec
index 97628a6..b57131b 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,6 +1,6 @@
Name: eccodes
Version: 2.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
@@ -59,7 +59,7 @@ BuildRequires: libpng-devel
BuildRequires: netcdf-devel
BuildRequires: numpy
BuildRequires: openjpeg2-devel
-BuildRequires: python2-devel
+# BuildRequires: python2-devel
# For tests
BuildRequires: perl(Getopt::Long)
@@ -109,7 +109,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 interfaces provide access to the main ecCodes
+Fortran 90 and Python (1) interfaces provide access to the main ecCodes
functionality.
ecCodes is an evolution of GRIB-API. It is designed to provide the user with
@@ -118,7 +118,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 are all maintained as in GRIB-API. However, the
+Fortran 90 and Python (1) 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
@@ -133,6 +133,12 @@ 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: for now only a python2 interface is provided by upstream,
+and since Fedora is phasing out python2 this interface has
+been removed from this package starting with Fedora 30.
+As soon as upstream provides a python3 interface that one will
+be added here.
+
#####################################################
%package devel
Summary: Contains ecCodes development files
@@ -146,17 +152,17 @@ 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.
+#%%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
@@ -184,7 +190,13 @@ 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.
+in C, Fortran 90, and Python (1).
+
+(1) Note: for now only a python2 interface is provided by upstream,
+and since Fedora is phasing out python2 this interface has
+been removed from this package starting with Fedora 30.
+As soon as upstream provides a python3 interface that one will
+be added here.
#####################################################
%prep
@@ -236,8 +248,8 @@ cd build
-DCMAKE_SKIP_RPATH=TRUE \
-DECCODES_SOVERSION=%{so_version} \
-DECCODES_SOVERSION_F90=%{so_version_f90} \
- -DPYTHON_EXECUTABLE=%{_bindir}/python2 \
..
+# -DPYTHON_EXECUTABLE=%%{_bindir}/python2 \
%make_build
@@ -275,14 +287,14 @@ 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
+#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
+#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
@@ -320,10 +332,10 @@ ctest -V %{?_smp_mflags}
%{_bindir}/*
%{_libdir}/*.so.*
-%files -n python2-%{name}
-%{python2_sitearch}/%{name}
-%{python2_sitearch}/%{name}-*-py*.egg-info
-%{python2_sitearch}/gribapi
+#%%files -n python2-%%{name}
+#%%{python2_sitearch}/%%{name}
+#%%{python2_sitearch}/%%{name}-*-py*.egg-info
+#%%{python2_sitearch}/gribapi
%files devel
%{_includedir}/*
@@ -346,6 +358,9 @@ ctest -V %{?_smp_mflags}
%changelog
+* Thu Sep 13 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.2-2
+- Remove python2 sub-package as per Mass Python 2 Package Removal for f30
+
* Sun Sep 9 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.2-1
- Upgrade to version 2.8.2
commit 797fa5158c5b4a206550f1cb54f6c46db405a9b4
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sun Sep 9 13:17:30 2018 +0200
activate the 3 remaining ExcludeArch commands again
diff --git a/eccodes.spec b/eccodes.spec
index b59e5ea..97628a6 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -30,6 +30,7 @@ Source0:
https://software.ecmwf.int/wiki/download/attachments/45757960/ec
# now and then. The current copy was downloaded 05-Jul-2018
# todo: rename the datapack using the download date to make it versioned
# in fedora and figure out how to insert this in this Source1 entry
+# (next time it changes)
Source1:
http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz
# Support 32-bit
#
https://software.ecmwf.int/issues/browse/SUP-1813
@@ -89,13 +90,14 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-#ExcludeArch: i686
+ExcludeArch: i686
# as explained in bugzilla #1562071
+# note: this is no longer part of fc30/rawhide
#ExcludeArch: ppc64
# 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
commit 91dca9f2cffd7209126f3597ab5d673aa0f917cd
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sun Sep 9 12:30:56 2018 +0200
re-add SHA512 for eccodes_test_data.tar.gz (again ...)
diff --git a/sources b/sources
index ca1c6cd..aabef93 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (eccodes-2.8.2-Source.tar.gz) =
942de24390df9de64a768e2f351c9acef5b0550a59695016b9753b22fbff260f8a6f9780240dbb2402bec372ee4c8224a68f3d70699a5df42b23c0a4c073114d
+SHA512 (eccodes_test_data.tar.gz) =
0f13137584525f12e184068501cc13a58fb8bb16ada680ca7f1575c6066fd2bc5995ec7afffb175c38958e71d991cea4b3972ad01402b54d2550e442241ffc7b
commit 76b0b8d3f8ffe5982c11155e3ef501b25abc772b
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sun Sep 9 12:21:41 2018 +0200
update to new upstream version 2.8.2 and disable ExcludeArch to test what happens in a
scratch build
diff --git a/eccodes-32bit.patch b/eccodes-32bit.patch
index 1e6495d..4ef204e 100644
--- a/eccodes-32bit.patch
+++ b/eccodes-32bit.patch
@@ -1,6 +1,6 @@
---- eccodes-2.8.0-Source.orig/src/grib_api_prototypes.h 2018-06-12 13:50:54.000000000
+0200
-+++ eccodes-2.8.0-Source/src/grib_api_prototypes.h 2018-06-28 14:58:28.302344717 +0200
-@@ -869,8 +869,8 @@ double grib_ieeefloat_error(double x);
+--- eccodes-2.8.2-Source.orig/src/grib_api_prototypes.h 2018-08-06 11:45:33.000000000
+0200
++++ eccodes-2.8.2-Source/src/grib_api_prototypes.h 2018-09-09 12:06:18.628509429 +0200
+@@ -871,8 +871,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);
unsigned long grib_ieee_to_long(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.8.0-Source.orig/src/grib_ieeefloat.c 2018-06-12 13:50:54.000000000 +0200
-+++ eccodes-2.8.0-Source/src/grib_ieeefloat.c 2018-06-28 14:58:28.303344693 +0200
+--- eccodes-2.8.2-Source.orig/src/grib_ieeefloat.c 2018-08-06 11:45:33.000000000 +0200
++++ eccodes-2.8.2-Source/src/grib_ieeefloat.c 2018-09-09 12:06:18.628509429 +0200
@@ -392,14 +392,14 @@ unsigned long grib_ieee_to_long(double x
* grib_encode_unsigned_long.
*/
diff --git a/eccodes.spec b/eccodes.spec
index 05f79fd..b59e5ea 100644
--- a/eccodes.spec
+++ b/eccodes.spec
@@ -1,6 +1,6 @@
Name: eccodes
-Version: 2.8.0
-Release: 3%{?dist}
+Version: 2.8.2
+Release: 1%{?dist}
Summary: WMO data format decoding and encoding
# force the shared libraries to have these so versions
@@ -8,11 +8,11 @@ Summary: WMO data format decoding and encoding
%global so_version_f90 0.1
%global datapack_date 20180705
-# latest rawhide grib_api version is 1.26.1-1
+# latest rawhide grib_api version is 1.27.0-1
# 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.26.1 (08-May-2018)
-%global final_grib_api_version 1.26.1-1
+# latest upstream grib_api release is 1.27.0 (09-Sep-2018)
+%global final_grib_api_version 1.27.0-1
# license remarks:
# most of eccodes is licensed ASL 2.0 but a special case must be noted.
@@ -30,7 +30,7 @@ Source0:
https://software.ecmwf.int/wiki/download/attachments/45757960/ec
# now and then. The current copy was downloaded 05-Jul-2018
# todo: rename the datapack using the download date to make it versioned
# in fedora and figure out how to insert this in this Source1 entry
-Source1:
http://download.ecmwf.org/test-data/grib_api/eccodes_test_data.tar.gz
+Source1:
http://download.ecmwf.org/test-data/eccodes/eccodes_test_data.tar.gz
# Support 32-bit
#
https://software.ecmwf.int/issues/browse/SUP-1813
# (unfortunately this issue is not public)
@@ -41,8 +41,7 @@ Patch2: eccodes-soversion.patch
# remove rpath from cmake/pkg-config.pc.in
Patch3: eccodes-rpath.patch
# fix compile flags in fortran checks
-#
https://software.ecmwf.int/issues/browse/SUP-1812
-# (unfortunately this issue is not public)
+# 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:
@@ -90,13 +89,13 @@ Requires: %{name}-data = %{version}-%{release}
Obsoletes: grib_api < %{final_grib_api_version}
# as explained in bugzilla #1562066
-ExcludeArch: i686
+#ExcludeArch: i686
# as explained in bugzilla #1562071
-ExcludeArch: ppc64
+#ExcludeArch: ppc64
# 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
@@ -159,6 +158,7 @@ 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
@@ -344,6 +344,9 @@ ctest -V %{?_smp_mflags}
%changelog
+* Sun Sep 9 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.2-1
+- Upgrade to version 2.8.2
+
* Fri Aug 17 2018 Jos de Kloe <josdekloe(a)gmail.com> - 2.8.0-3
- rebuild with patch provided by Matthew Krupcale for f28
commit 44ae809acdc90d9c5ab5b159b6b43608fdcc10f7
Author: Jos de Kloe <josdekloe(a)gmail.com>
Date: Sun Sep 9 12:19:33 2018 +0200
add new upstream version
diff --git a/.gitignore b/.gitignore
index 5cd40f8..1517312 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/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
diff --git a/sources b/sources
index 0bca58c..ca1c6cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (eccodes-2.8.0-Source.tar.gz) =
c915d5e5f5856caf219101c42225a4846e61c523cb313b369fb7dd2d32ee556088fba79d7091befa29aec0795660e3aa671be8e0c1ea4bd0badd75152bf484a8
-SHA512 (eccodes_test_data.tar.gz) =
0f13137584525f12e184068501cc13a58fb8bb16ada680ca7f1575c6066fd2bc5995ec7afffb175c38958e71d991cea4b3972ad01402b54d2550e442241ffc7b
+SHA512 (eccodes-2.8.2-Source.tar.gz) =
942de24390df9de64a768e2f351c9acef5b0550a59695016b9753b22fbff260f8a6f9780240dbb2402bec372ee4c8224a68f3d70699a5df42b23c0a4c073114d