Notification time stamped 2023-04-01 01:03:48 UTC
From a95a642fb43e249397c1217808b4dee4a6e64971 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvanderr(a)redhat.com>
Date: Apr 01 2023 01:03:30 +0000
Subject: Fix for .whl arch mismatch issue
---
diff --git a/qpid-proton.spec b/qpid-proton.spec
index a1b1b6a..fd5e760 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -239,7 +239,15 @@ rm -rf build
# library to be installed so we don't duplicate it inside the extension
# That is also why we have to point pkg-config at the installed library
PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig %py3_build_wheel
-%py3_install_wheel python_qpid_proton-%{version}-cp311-cp311-linux_%{_arch}.whl
+# Fix wheel arch name mismatch for some arches
+%if "%{_arch}" == "i386"
+%define whl_arch "i686"
+%elif "%{_arch}" == "arm"
+%define whl_arch "armv7l"
+%else
+%define whl_arch "%{_arch}"
+%endif
+%py3_install_wheel python_qpid_proton-%{version}-cp311-cp311-linux_%{whl_arch}.whl
# We seem to need to strip the build extension otherwise it seems to embed a reference to
# the buildroot in the debug info which fails the rpmbuild - probably because we massaged
# the pkgconfig path above
https://src.fedoraproject.org/rpms/qpid-proton/c/a95a642fb43e249397c1217808…
Notification time stamped 2023-04-01 01:01:38 UTC
From ef0d5f012e768a76aa528403d45c0fcd30680658 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvanderr(a)redhat.com>
Date: Apr 01 2023 01:01:26 +0000
Subject: Fix for .whl arch mismatch issue
---
diff --git a/qpid-proton.spec b/qpid-proton.spec
index a1b1b6a..fd5e760 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -239,7 +239,15 @@ rm -rf build
# library to be installed so we don't duplicate it inside the extension
# That is also why we have to point pkg-config at the installed library
PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig %py3_build_wheel
-%py3_install_wheel python_qpid_proton-%{version}-cp311-cp311-linux_%{_arch}.whl
+# Fix wheel arch name mismatch for some arches
+%if "%{_arch}" == "i386"
+%define whl_arch "i686"
+%elif "%{_arch}" == "arm"
+%define whl_arch "armv7l"
+%else
+%define whl_arch "%{_arch}"
+%endif
+%py3_install_wheel python_qpid_proton-%{version}-cp311-cp311-linux_%{whl_arch}.whl
# We seem to need to strip the build extension otherwise it seems to embed a reference to
# the buildroot in the debug info which fails the rpmbuild - probably because we massaged
# the pkgconfig path above
https://src.fedoraproject.org/rpms/qpid-proton/c/ef0d5f012e768a76aa528403d4…
Notification time stamped 2023-04-01 00:58:54 UTC
From 5fdd59a003c53c9616ae172bdc7486fd93764466 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvanderr(a)redhat.com>
Date: Apr 01 2023 00:58:40 +0000
Subject: Fix for .whl arch mismatch issue
---
diff --git a/qpid-proton.spec b/qpid-proton.spec
index 3ded8fc..6480d43 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -239,7 +239,15 @@ rm -rf build
# library to be installed so we don't duplicate it inside the extension
# That is also why we have to point pkg-config at the installed library
PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig %py3_build_wheel
-%py3_install_wheel python_qpid_proton-%{version}-cp311-cp311-linux_%{_arch}.whl
+# Fix wheel arch name mismatch for some arches
+%if "%{_arch}" == "i386"
+%define whl_arch "i686"
+%elif "%{_arch}" == "arm"
+%define whl_arch "armv7l"
+%else
+%define whl_arch "%{_arch}"
+%endif
+%py3_install_wheel python_qpid_proton-%{version}-cp311-cp311-linux_%{whl_arch}.whl
# We seem to need to strip the build extension otherwise it seems to embed a reference to
# the buildroot in the debug info which fails the rpmbuild - probably because we massaged
# the pkgconfig path above
https://src.fedoraproject.org/rpms/qpid-proton/c/5fdd59a003c53c9616ae172bdc…