From 9e701cbc65570738e1e87f16efe8fd3753a857a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 30 Mar 2022 11:19:29 +0200
Subject: [PATCH] Update to 7.3.9

---
 .gitignore               |  1 +
 189-use-rpm-wheels.patch | 17 ++++++++---------
 pypy3.9.spec             |  8 ++++++--
 sources                  |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

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@redhat.com> - 7.3.9-1.3.9
+- Update to 7.3.9
+- Fixes: rhbz#2069873
+
 * Tue Mar 01 2022 Miro Hrončok <mhroncok@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