From 3e276b5ca887cfb609ce6a51a82f2c6aa8cf3c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 22 Aug 2023 11:47:43 +0200 Subject: [PATCH 1/2] Make PyPy 3.10 the main PyPy 3 on Fedora 39+ --- pypy3.9.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pypy3.9.spec b/pypy3.9.spec index f20596d..1b04142 100644 --- a/pypy3.9.spec +++ b/pypy3.9.spec @@ -10,7 +10,7 @@ Version: %{basever}.%{micro}%{?pre:~%{pre}} # by Python version as well. # This potentially allows tags like Obsoletes: pypy3 < %%{version}-%%{release}. # https://bugzilla.redhat.com/2053880 -%global baserelease 1 +%global baserelease 2 Release: %{baserelease}.%{pyversion}%{?dist} Summary: Python %{pyversion} implementation with a Just-In-Time compiler @@ -68,6 +68,7 @@ ExcludeArch: %{ix86} # We refer to this subdir of the source tree in a few places during the build: %global goal_dir pypy/goal +%if 0%{?fedora} < 39 # 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 @@ -75,6 +76,9 @@ ExcludeArch: %{ix86} # 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 +%endif %ifarch %{ix86} x86_64 %{arm} %global _package_note_linker gold @@ -836,6 +840,9 @@ CheckPyPy pypy%{pyversion}-c %changelog +* Tue Aug 22 2023 Miro Hrončok - 7.3.12-2.3.9 +- Make PyPy 3.10 the main PyPy 3 on Fedora 39+ + * Wed Jul 26 2023 Miro Hrončok - 7.3.12-1.3.9 - Update to 7.3.12 - Fixes: rhbz#2203423 From 18f5682471598173bf765961f6330b1560db9690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 4 Oct 2023 11:37:49 +0200 Subject: [PATCH 2/2] Update to 7.3.13 --- .gitignore | 1 + pypy3.9.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0fa084a..3a926da 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /pypy3.9-v7.3.9-src.tar.bz2 /pypy3.9-v7.3.11-src.tar.bz2 /pypy3.9-v7.3.12-src.tar.bz2 +/pypy3.9-v7.3.13-src.tar.bz2 diff --git a/pypy3.9.spec b/pypy3.9.spec index 1b04142..465f997 100644 --- a/pypy3.9.spec +++ b/pypy3.9.spec @@ -1,5 +1,5 @@ %global basever 7.3 -%global micro 12 +%global micro 13 #global pre ... %global pyversion 3.9 Name: pypy%{pyversion} @@ -10,7 +10,7 @@ Version: %{basever}.%{micro}%{?pre:~%{pre}} # by Python version as well. # This potentially allows tags like Obsoletes: pypy3 < %%{version}-%%{release}. # https://bugzilla.redhat.com/2053880 -%global baserelease 2 +%global baserelease 1 Release: %{baserelease}.%{pyversion}%{?dist} Summary: Python %{pyversion} implementation with a Just-In-Time compiler @@ -840,6 +840,10 @@ CheckPyPy pypy%{pyversion}-c %changelog +* Wed Oct 04 2023 Miro Hrončok - 7.3.13-1.3.9 +- Update to 7.3.13 +- Fixes: rhbz#2241298 + * Tue Aug 22 2023 Miro Hrončok - 7.3.12-2.3.9 - Make PyPy 3.10 the main PyPy 3 on Fedora 39+ diff --git a/sources b/sources index 4c6c210..9a21525 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pypy3.9-v7.3.12-src.tar.bz2) = 8e819a1ec3f3ce7fc5f901fb554660288a57e2a4834a3da35c1a57faf88ef4129240628a58334d2e0c2b1dda412da5d85ec943abe8046c0ce5d0cd0a0f7fc42a +SHA512 (pypy3.9-v7.3.13-src.tar.bz2) = 04b184050625f06d2acaa836a786db788c4f658f3384ebde176d0acc95044ee83dbf7193ebab1e4fd6275bed7a590d3945482294be32d8f94e8c541e053dce59