6:10 a.m.
The package rpms/pypy3.9.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.9.git/commit/?id=2c45725eb8....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit 2c45725eb8a4a7c0e5dc04596ce1c3f3325ad0a6
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Mar 30 11:21:16 2022 +0200
Exclude ix86 on F37+
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
diff --git a/pypy3.9.spec b/pypy3.9.spec
index 979d98a..7bdf6ab 100644
--- a/pypy3.9.spec
+++ b/pypy3.9.spec
@@ -29,6 +29,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 9e701cbc65570738e1e87f16efe8fd3753a857a1
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Mar 30 11:19:29 2022 +0200
Update to 7.3.9
diff --git a/.gitignore b/.gitignore
index 2cc60f0..60bbe63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/pypy3.9-v7.3.8rc1-src.tar.bz2
/pypy3.9-v7.3.8rc2-src.tar.bz2
/pypy3.9-v7.3.8-src.tar.bz2
+/pypy3.9-v7.3.9-src.tar.bz2
diff --git a/189-use-rpm-wheels.patch b/189-use-rpm-wheels.patch
index 4ad6f24..4b2fffa 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 e510cc7..8b736b8 100644
--- a/lib-python/3/ensurepip/__init__.py
+++ b/lib-python/3/ensurepip/__init__.py
@@ -1,3 +1,5 @@
@@ -8,18 +8,14 @@ index 597a1ef9ee..3bfab52083 100644
import os
import os.path
import sys
-@@ -6,13 +8,29 @@ import tempfile
+@@ -6,13 +8,28 @@ import tempfile
import subprocess
from importlib import resources
-from . import _bundled
--
++__all__ = ["version", "bootstrap"]
- __all__ = ["version", "bootstrap"]
--_SETUPTOOLS_VERSION = "58.1.0"
--_PIP_VERSION = "21.2.4"
-+
+_WHEEL_DIR = "/usr/share/python-wheels/"
+
+_wheels = {}
@@ -38,11 +34,14 @@ index 597a1ef9ee..3bfab52083 100644
+_SETUPTOOLS_VERSION = _get_most_recent_wheel_version("setuptools")
+
+_PIP_VERSION = _get_most_recent_wheel_version("pip")
-+
+
+-__all__ = ["version", "bootstrap"]
+-_SETUPTOOLS_VERSION = "58.1.0"
+-_PIP_VERSION = "22.0.4"
_PROJECTS = [
("setuptools", _SETUPTOOLS_VERSION, "py3"),
("pip", _PIP_VERSION, "py3"),
-@@ -101,13 +119,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False,
+@@ -101,13 +118,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.9.spec b/pypy3.9.spec
index 9c1b4b1..979d98a 100644
--- a/pypy3.9.spec
+++ b/pypy3.9.spec
@@ -1,5 +1,5 @@
%global basever 7.3
-%global micro 8
+%global micro 9
#global pre ...
%global pyversion 3.9
Name: pypy%{pyversion}
@@ -236,7 +236,7 @@ Obsoletes: pypy3-libs < 7.3.4-4
Requires: python-setuptools-wheel
Requires: python-pip-wheel
%else
-Provides: bundled(python3dist(pip)) = 21.2.4
+Provides: bundled(python3dist(pip)) = 22.0.4
Provides: bundled(python3dist(setuptools)) = 58.1.0
%endif
@@ -821,6 +821,10 @@ CheckPyPy pypy%{pyversion}-c
%changelog
+* Wed Mar 30 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.9-1.3.9
+- Update to 7.3.9
+- Fixes: rhbz#2069873
+
* Tue Mar 01 2022 Miro Hrončok <mhroncok(a)redhat.com> - 7.3.8-1.3.9
- 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 31f6e92..ec552a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pypy3.9-v7.3.8-src.tar.bz2) =
aed018738af7a225f516ec37d059d539f486d9dd427fe000805147b197f496d5fcb0387e47008524753ad18224aebeb1e68f9e2093acbe37468e02bff92f7126
+SHA512 (pypy3.9-v7.3.9-src.tar.bz2) =
83f8a6a2da351c190d2d224242cbc35e35529c7a8e8d842eaf5c945cbce2e172b02a340f32af3d49df8d5288370d794d5bc95fc12dd4a13d817c925abf06198a
commit d6380f72ef33731c3d217008a340665caccccc67
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Wed Mar 30 11:13:27 2022 +0200
Define %baserelease to make bumpspec work properly
diff --git a/pypy3.9.spec b/pypy3.9.spec
index cb84b30..9c1b4b1 100644
--- a/pypy3.9.spec
+++ b/pypy3.9.spec
@@ -10,7 +10,8 @@ Version: %{basever}.%{micro}%{?pre:~%{pre}}
# 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
commit 394fb5b0e76ad216cf83856149260f8448855863
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue Mar 8 00:22:48 2022 +0100
Add a reminder to update comps
Unfortunately, comps do not support virtual provides,
so they need to be updated whenever main pypy3 changes.
diff --git a/pypy3.9.spec b/pypy3.9.spec
index 455ff71..cb84b30 100644
--- a/pypy3.9.spec
+++ b/pypy3.9.spec
@@ -65,6 +65,12 @@ URL: http://pypy.org/
%global goal_dir pypy/goal
%if 0%{?fedora} >= 36
+# REMINDER: When updating the main pypy3 version for a certain Fedora release
+# make sure to update the python-classroom group in https://pagure.io/fedora-comps/
+# 1. locate comps-fXX.xml.in for each affected Fedora release
+# 2. inside the <id>python-classroom</id> group locate <packagereq
...>pypy3.N-devel</packagereq>
+# 3. change the package name to match the new version
+# 4. submit changes as a pull request and make sure somebody merges it
%bcond_without main_pypy3
%else
%bcond_with main_pypy3