From 3dbe18122c10da30c8c55159e078cefeefb2f1ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 17 Sep 2020 13:56:42 +0200
Subject: [PATCH] Update to 3.9.0rc2

Patch 111 was rebased manually but trivially.
---
 00111-no-static-lib.patch  | 18 +++++++++---------
 00274-fix-arch-names.patch |  2 +-
 python3.9.spec             |  9 ++++++---
 sources                    |  4 ++--
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch
index 601ddde..3b3afb0 100644
--- a/00111-no-static-lib.patch
+++ b/00111-no-static-lib.patch
@@ -21,19 +21,19 @@ Co-authored-by: Miro Hrončok <miro@hroncok.cz>
  1 file changed, 2 insertions(+), 19 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index dede88711e..07e3380781 100644
+index 77f91e72b1..bb4069b18a 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -582,7 +582,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
+@@ -586,7 +586,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
  	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
  
  # Build the interpreter
--$(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+$(BUILDPYTHON):	Programs/python.o $(LDLIBRARY) $(PY3LIBRARY)
+-$(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
++$(BUILDPYTHON):	Programs/python.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
  	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
  
  platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -630,12 +630,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -634,12 +634,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
  		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
  		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
  
@@ -46,16 +46,16 @@ index dede88711e..07e3380781 100644
  libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
  		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
-@@ -713,7 +707,7 @@ Makefile Modules/config.c: Makefile.pre \
+@@ -721,7 +715,7 @@ Makefile Modules/config.c: Makefile.pre \
  	@echo "The Makefile was updated, you may need to re-run make."
  
  
--Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
-+Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY)
+-Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
++Programs/_testembed: Programs/_testembed.o $(LDLIBRARY) $(PY3LIBRARY) $(EXPORTSYMS)
  	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
  
  ############################################################################
-@@ -1622,17 +1616,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+@@ -1630,17 +1624,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config
  		else	true; \
  		fi; \
  	done
diff --git a/00274-fix-arch-names.patch b/00274-fix-arch-names.patch
index 99514d0..81e7e6f 100644
--- a/00274-fix-arch-names.patch
+++ b/00274-fix-arch-names.patch
@@ -29,7 +29,7 @@ index ba37cf99e2..52a9ec6662 100755
  	ppc64le | powerpc64little)
  		basic_machine=powerpc64le-unknown
 diff --git a/configure.ac b/configure.ac
-index 7bbceb10d8..047676a168 100644
+index d60f05251a..6a95964657 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -759,9 +759,9 @@ cat >> conftest.c <<EOF
diff --git a/python3.9.spec b/python3.9.spec
index bf05ee6..10b784f 100644
--- a/python3.9.spec
+++ b/python3.9.spec
@@ -14,10 +14,10 @@ URL: https://www.python.org/
 #  WARNING  When rebasing to a new Python version,
 #           remember to update the python3-docs package as well
 %global general_version %{pybasever}.0
-%global prerel rc1
+%global prerel rc2
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Python
 
 
@@ -253,7 +253,7 @@ Source11: idle3.appdata.xml
 # Was Patch0 in ivazquez' python3000 specfile
 Patch1: 00001-rpath.patch
 
-# 00111 # 03918d404a40a50c9f5f93dc748b52e613d70d31
+# 00111 # 93b40d73360053ca68b0aeec33b6a8ca167e33e2
 # Don't try to build a libpythonMAJOR.MINOR.a
 #
 # Downstream only: not appropriate for upstream.
@@ -1640,6 +1640,9 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Thu Sep 17 2020 Miro Hrončok <mhroncok@redhat.com> - 3.9.0~rc2-1
+- Update to 3.9.0rc2
+
 * Wed Aug 12 2020 Petr Viktorin <pviktori@redhat.com> - 3.9.0~rc1-2
 - In sys.version and initial REPL message, list the source commit as "default"
 
diff --git a/sources b/sources
index 0ba1c12..20fdf94 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Python-3.9.0rc1.tar.xz) = 8fddf940600bdd4096c0144f689fb9e803bdc7a1ee00f46ccfde3566342ed465c7ac6806613e4f61440fb65f8f83057204bd0dc432ac379759cd4d410c151eef
-SHA512 (Python-3.9.0rc1.tar.xz.asc) = ac03f9ab597f6fe6bd135a1481199e8d56bdfcd527fda53619ac0d2bdddff3e66555513bf2739e488682341f7090f16080273498519326d23ec3291ffbf00fcd
+SHA512 (Python-3.9.0rc2.tar.xz) = 77aced89518d86c1fb0e48a96be135c8385f6fb912543f7bb8e792b15ca0d59005269a4c35d4185d31536980572f8fa0adee022a572a268e1f8e9832a052ef5c
+SHA512 (Python-3.9.0rc2.tar.xz.asc) = 51d8b6bbcaa9e27e6e023881539726665b05ceeab19ba34f1e9b8eb2a6c8c8a8cdf4c29468d5d8d0618c16a1dc7bfc30ca16a3b60bd5a9c6a6b6e01fba31c5d5