The package rpms/pypy3.8.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/pypy3.8.git/commit/?id=40a7e6228e....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 40a7e6228e5cf018ff29ea58d7f4fabd281592c7
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Mar 30 09:21:16 2022 +0000
Exclude ix86 on F37+
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
diff --git a/pypy3.8.spec b/pypy3.8.spec
index 531e9eb..a310859 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -26,6 +26,11 @@ Summary: Python %{pyversion} implementation with a Just-In-Time
compiler
License: MIT and Python and UCD and BSD and (ASL 2.0 or BSD)
URL:
http://pypy.org/
+#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
+ExcludeArch: %{ix86}
+%endif
+
# High-level configuration of the build:
# libmpdec (mpdecimal package in Fedora) is tightly coupled with the
commit 892c110f4c586effa395732caed574e94e3a3fcd
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Mar 30 09:19:29 2022 +0000
Update to 7.3.9
diff --git a/.gitignore b/.gitignore
index 8429f7a..9de8ba6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/pypy3.7-v7.3.7-src.tar.bz2
/pypy3.8-v7.3.7-src.tar.bz2
/pypy3.8-v7.3.8-src.tar.bz2
+/pypy3.8-v7.3.9-src.tar.bz2
diff --git a/189-use-rpm-wheels.patch b/189-use-rpm-wheels.patch
index 8ac359d..a707a49 100644
--- a/189-use-rpm-wheels.patch
+++ b/189-use-rpm-wheels.patch
@@ -1,5 +1,5 @@
diff --git a/lib-python/3/ensurepip/__init__.py b/lib-python/3/ensurepip/__init__.py
-index 597a1ef9ee..3bfab52083 100644
+index 9dced0e..3bfab52 100644
--- a/lib-python/3/ensurepip/__init__.py
+++ b/lib-python/3/ensurepip/__init__.py
@@ -1,6 +1,7 @@
@@ -11,14 +11,16 @@ index 597a1ef9ee..3bfab52083 100644
import sys
import runpy
import tempfile
-@@ -9,9 +10,24 @@ import subprocess
+@@ -8,9 +9,26 @@ import subprocess
- __all__ = ["version", "bootstrap"]
+ __all__ = ["version", "bootstrap"]
+-_PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "58.1.0"
+-_PIP_VERSION = "22.0.4"
++
+_WHEEL_DIR = "/usr/share/python-wheels/"
-
--_PIP_VERSION = "21.1.1"
++
+_wheels = {}
+
+def _get_most_recent_wheel_version(pkg):
@@ -35,10 +37,11 @@ index 597a1ef9ee..3bfab52083 100644
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
+
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
-
++
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION, "py3"),
-@@ -101,13 +117,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+ ("pip", _PIP_VERSION, "py3"),
+@@ -99,13 +117,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
# additional paths that need added to sys.path
additional_paths = []
for project, version, py_tag in _PROJECTS:
diff --git a/pypy3.8.spec b/pypy3.8.spec
index 1ad47a2..531e9eb 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -1,7 +1,7 @@
%global basever 7.3
%global pyversion 3.8
Name: pypy%{pyversion}
-Version: %{basever}.8
+Version: %{basever}.9
# The Python version is included in Release to workaround debuginfo conflicts
# and make pypy versions with otherwise the same version-release always sorted
# by Python version as well.
@@ -289,7 +289,7 @@ Obsoletes: pypy3-libs < 7.3.4-4
Requires: python-setuptools-wheel
Requires: python-pip-wheel
%else
-Provides: bundled(python3dist(pip)) = 21.1.1
+Provides: bundled(python3dist(pip)) = 22.0.4
Provides: bundled(python3dist(setuptools)) = 58.1.0
%endif
@@ -881,6 +881,10 @@ CheckPyPy pypy3-c
%changelog
+* Wed Mar 30 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.9-1.3.8
+- Update to 7.3.9
+- Fixes: rhbz#2069873
+
* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1.3.8
- Include the Python version in Release to workaround debuginfo conflicts
and make same builds of different PyPy sort in a predictable way (e.g. wrt Obsoletes)
diff --git a/sources b/sources
index 61a357f..cf59640 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pypy3.8-v7.3.8-src.tar.bz2) =
d5f124740ac04786cf087436dfe89590997e158b4a6324892b8d8366b50f980222c9f9a1ac627333d7684ffd02846fed0f5c6a8d2bbbfdd4f26192abe2a40963
+SHA512 (pypy3.8-v7.3.9-src.tar.bz2) =
2d1f1c0eda08344332fb983a1cd4e76391eb95197519d151d28ff7e6d3a337bc584908eed523a2f26aee0f62e61650353fada1a0d96d57dd197b2f349e033609
commit a48a668153becbac741cc746a405b6dcb9009442
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Mar 30 09:13:27 2022 +0000
Define %baserelease to make bumpspec work properly
diff --git a/pypy3.8.spec b/pypy3.8.spec
index 189c194..1ad47a2 100644
--- a/pypy3.8.spec
+++ b/pypy3.8.spec
@@ -7,7 +7,8 @@ Version: %{basever}.8
# by Python version as well.
# This potentially allows tags like Obsoletes: pypy3 < %%{version}-%%{release}.
#
https://bugzilla.redhat.com/2053880
-Release: 1.%{pyversion}%{?dist}
+%global baserelease 1
+Release: %{baserelease}.%{pyversion}%{?dist}
Summary: Python %{pyversion} implementation with a Just-In-Time compiler
# PyPy is MIT