The package rpms/h5py.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/h5py.git/commit/?id=6a84f3d5d78cf....
Change:
-ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 6a84f3d5d78cfc7c5b6d786c63448c11074fd1ac
Author: Terje Rosten <terje.rosten(a)ntnu.no>
Date: Tue Feb 27 16:52:43 2024 +0100
Re-enable ix86
diff --git a/h5py.spec b/h5py.spec
index 46a45c5..f532f2b 100644
--- a/h5py.spec
+++ b/h5py.spec
@@ -4,7 +4,7 @@
Summary: A Python interface to the HDF5 library
Name: h5py
Version: 3.10.0
-Release: 6%{?dist}
+Release: 7%{?dist}
License: BSD
URL:
http://www.h5py.org/
Source0:
https://files.pythonhosted.org/packages/source/h/h5py/h5py-%{version}.tar.gz
@@ -33,11 +33,6 @@ BuildRequires: python%{python3_pkgversion}-pytest-mpi
BuildRequires: python%{python3_pkgversion}-six
BuildRequires: python%{python3_pkgversion}-sphinx
-#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-%if 0%{?fedora} > 39
-ExcludeArch: %{ix86}
-%endif
-
# MPI builds
%ifarch %{ix86}
%bcond openmpi 0
@@ -241,6 +236,9 @@ mpirun %{__python3} -m pytest --pyargs h5py -rxXs --with-mpi
${PYTHONPATH} || ex
%changelog
+* Tue Feb 27 2024 Orion Poplawski <orion(a)nwra.com> - 3.10.0-7
+- Re-enable ix86
+
* Thu Feb 22 2024 Christoph Junghans <junghans(a)votca.org> - 3.10.0-6
- Re-enable openmpi build and drop ix86
commit be8291f0f785c1eb3d8601577c977a677ae0dace
Author: Orion Poplawski <orion(a)nwra.com>
Date: Tue Feb 27 07:48:04 2024 -0700
Use libc.stdint to fix i686
diff --git a/2382.patch b/2382.patch
new file mode 100644
index 0000000..10bb28b
--- /dev/null
+++ b/2382.patch
@@ -0,0 +1,22 @@
+From 387a22b8c1513800c0401f496b4ed512c1639798 Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <orion(a)nwra.com>
+Date: Thu, 22 Feb 2024 08:41:17 -0700
+Subject: [PATCH] Use libc.stdint instead of numpy
+
+---
+ h5py/api_types_ext.pxd | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/h5py/api_types_ext.pxd b/h5py/api_types_ext.pxd
+index 91acb128e..55a239f55 100644
+--- a/h5py/api_types_ext.pxd
++++ b/h5py/api_types_ext.pxd
+@@ -20,7 +20,7 @@ from libc.string cimport strlen, strchr, strcpy, strncpy, strcmp,\
+ ctypedef long size_t
+ from libc.time cimport time_t
+
+-from numpy cimport int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t,
uint64_t
++from libc.stdint cimport int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t,
uint64_t
+
+ IF UNAME_SYSNAME != "Windows":
+ cdef extern from "unistd.h":
diff --git a/h5py.spec b/h5py.spec
index cd57160..46a45c5 100644
--- a/h5py.spec
+++ b/h5py.spec
@@ -16,6 +16,8 @@ Patch1:
0001-Fix-compiling-fileobj-file-driver-with-Cython-3.0.patch
Patch2: h5py-3.10.0-python-crash-file-test2.patch
# Properly cast const pointers -
https://github.com/h5py/h5py/pull/2380
Patch3: h5py-const.patch
+# Use libc.stdint to fix i686
+Patch4:
https://github.com/h5py/h5py/pull/2382.patch
BuildRequires: gcc
BuildRequires: hdf5-devel
BuildRequires: liblzf-devel
@@ -110,7 +112,6 @@ Requires: mpich
%autosetup -N -c -n %{name}-%{version}
pushd %{name}-%{version}
%autopatch -p1
-sed -i -e 's/^from numpy cimport int8_t/from libc.stdint cimport int8_t/'
h5py/api_types_ext.pxd
popd
mv %{name}-%{version} serial
cd serial
commit 2096232e30b0600eb95f4c0235a108eebd3b6e82
Author: Orion Poplawski <orion(a)nwra.com>
Date: Fri Feb 23 16:53:38 2024 -0700
Use libc.stdint
diff --git a/h5py.spec b/h5py.spec
index 50a2235..cd57160 100644
--- a/h5py.spec
+++ b/h5py.spec
@@ -110,6 +110,7 @@ Requires: mpich
%autosetup -N -c -n %{name}-%{version}
pushd %{name}-%{version}
%autopatch -p1
+sed -i -e 's/^from numpy cimport int8_t/from libc.stdint cimport int8_t/'
h5py/api_types_ext.pxd
popd
mv %{name}-%{version} serial
cd serial