The package rpms/pypy3.7.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.7.git/commit/?id=f62e12eee3....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit f62e12eee347a368afd79b5030d59bf47e32271f
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.7.spec b/pypy3.7.spec
index c0b9c79..618c5a1 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.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 ee5b307785164e4189d85731bd3f08774a6e71cb
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 a5a5e7e..e5fae54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
/pypy3.7-v7.3.6-src.tar.bz2
/pypy3.7-v7.3.7-src.tar.bz2
/pypy3.7-v7.3.8-src.tar.bz2
+/pypy3.7-v7.3.9-src.tar.bz2
diff --git a/189-use-rpm-wheels.patch b/189-use-rpm-wheels.patch
index 8fd8a55..4da4d7d 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 94d40b0..9135b80 100644
+index 8289c49..f0d7106 100644
--- a/lib-python/3/ensurepip/__init__.py
+++ b/lib-python/3/ensurepip/__init__.py
@@ -1,3 +1,5 @@
@@ -8,14 +8,16 @@ index 94d40b0..9135b80 100644
import os
import os.path
import pkgutil
-@@ -9,9 +11,24 @@ import tempfile
- __all__ = ["version", "bootstrap"]
+@@ -7,9 +9,26 @@ import tempfile
+ __all__ = ["version", "bootstrap"]
+-_PACKAGE_NAMES = ('setuptools', 'pip')
-_SETUPTOOLS_VERSION = "47.1.0"
+-_PIP_VERSION = "22.0.4"
++
+_WHEEL_DIR = "/usr/share/python-wheels/"
-
--_PIP_VERSION = "20.1.1"
++
+_wheels = {}
+
+def _get_most_recent_wheel_version(pkg):
@@ -32,10 +34,11 @@ index 94d40b0..9135b80 100644
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
+
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
-
++
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION, "py3"),
-@@ -103,13 +120,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+ ("pip", _PIP_VERSION, "py3"),
+@@ -100,13 +119,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:
@@ -50,6 +53,6 @@ index 94d40b0..9135b80 100644
+ with open(os.path.join(_WHEEL_DIR, wheel_name), "rb") as sfp:
+ with open(os.path.join(tmpdir, wheel_name), "wb") as fp:
+ fp.write(sfp.read())
-
+
additional_paths.append(os.path.join(tmpdir, wheel_name))
-
+
diff --git a/pypy3.7.spec b/pypy3.7.spec
index a16d466..c0b9c79 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.spec
@@ -1,7 +1,7 @@
%global basever 7.3
%global pyversion 3.7
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.
@@ -293,7 +293,7 @@ Obsoletes: pypy3-libs < 7.3.4-4
Requires: python-setuptools-wheel
Requires: python-pip-wheel
%else
-Provides: bundled(python3dist(pip)) = 20.1.1
+Provides: bundled(python3dist(pip)) = 22.0.4
Provides: bundled(python3dist(setuptools)) = 47.1.0
%endif
@@ -885,6 +885,10 @@ CheckPyPy pypy3-c
%changelog
+* Wed Mar 30 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.9-1.3.7
+- Update to 7.3.9
+- Fixes: rhbz#2069873
+
* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1.3.7
- 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 da44f3a..3667e49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pypy3.7-v7.3.8-src.tar.bz2) =
654852caeeb4f01bd47807283d2cf1c19a504b207be23dc40cf3ca4369a14e8f71773a9641a5074de92acfda24d10092cb4d4778e806258dc23f2cfb4d5eaaae
+SHA512 (pypy3.7-v7.3.9-src.tar.bz2) =
81812f40bb4386721934bca4f8b18660b9ff5c2fa8b87e6618c95068f7493db8b165590f703054e82fd327fcd1da135e7c86df0de3caa4af48300ce6065289a0
commit 94e934459ac709d70f266b785a6890737c1a8458
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.7.spec b/pypy3.7.spec
index 200d822..a16d466 100644
--- a/pypy3.7.spec
+++ b/pypy3.7.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