From 43b44f18b4d36018c63d5ba101f53951bbce6174 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Apr 30 2020 15:47:56 +0000 Subject: Rebased to 3.8.3rc1 Patches rebased cleanly. --- diff --git a/00001-rpath.patch b/00001-rpath.patch index 5731d5a..13b81d1 100644 --- a/00001-rpath.patch +++ b/00001-rpath.patch @@ -1,4 +1,4 @@ -From bf01d6c367d9cb8f6594afa87c16f0498ae7321f Mon Sep 17 00:00:00 2001 +From cb63ca0eae963582c89b19d19c3edb9ae29b0b71 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 13 Jan 2010 21:25:18 +0000 Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard @@ -9,7 +9,7 @@ Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard 1 file changed, 9 insertions(+) diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index d10a78da31..4df4b67810 100644 +index 4d7a6de740..353086a648 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -82,6 +82,15 @@ class UnixCCompiler(CCompiler): @@ -29,5 +29,5 @@ index d10a78da31..4df4b67810 100644 include_dirs=None, extra_preargs=None, extra_postargs=None): fixed_args = self._fix_compile_args(None, macros, include_dirs) -- -2.24.1 +2.26.2 diff --git a/00102-lib64.patch b/00102-lib64.patch index 63ddaa5..1924589 100644 --- a/00102-lib64.patch +++ b/00102-lib64.patch @@ -1,4 +1,4 @@ -From 96580364051672475607c88cdb31ec875cea6e97 Mon Sep 17 00:00:00 2001 +From baa063d998b8696d88d38d2e5ce98899426e5011 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 13 Jan 2010 21:25:18 +0000 Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/ @@ -139,10 +139,10 @@ index b9e2fafbc0..0ae6d35b69 100644 'scripts': '{userbase}/bin', 'data': '{userbase}', diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py -index 41c4229919..543c88432a 100644 +index 1bbc697936..9a7e80dfa0 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py -@@ -266,8 +266,8 @@ class HelperFunctionsTests(unittest.TestCase): +@@ -267,8 +267,8 @@ class HelperFunctionsTests(unittest.TestCase): dirs = site.getsitepackages() if os.sep == '/': # OS X, Linux, FreeBSD, etc @@ -198,10 +198,10 @@ index b727f66953..a0c5fb6139 100644 return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } diff --git a/configure b/configure -index a979363acf..b89ae1be3c 100755 +index 8886561645..78867c6ffc 100755 --- a/configure +++ b/configure -@@ -15188,9 +15188,9 @@ fi +@@ -15214,9 +15214,9 @@ fi if test x$PLATFORM_TRIPLET = x; then @@ -214,10 +214,10 @@ index a979363acf..b89ae1be3c 100755 diff --git a/configure.ac b/configure.ac -index e57ef7c38b..c59cbc223f 100644 +index d8de9d4943..477a5ff1cb 100644 --- a/configure.ac +++ b/configure.ac -@@ -4674,9 +4674,9 @@ fi +@@ -4689,9 +4689,9 @@ fi dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) if test x$PLATFORM_TRIPLET = x; then @@ -230,7 +230,7 @@ index e57ef7c38b..c59cbc223f 100644 AC_SUBST(LIBPL) diff --git a/setup.py b/setup.py -index 20d7f35652..024a1035c0 100644 +index b168ed4082..8628b9d1cd 100644 --- a/setup.py +++ b/setup.py @@ -649,7 +649,7 @@ class PyBuildExt(build_ext): @@ -257,5 +257,5 @@ index 20d7f35652..024a1035c0 100644 libraries=readline_libs)) else: -- -2.24.1 +2.26.2 diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch index 2a58b21..f59e76c 100644 --- a/00111-no-static-lib.patch +++ b/00111-no-static-lib.patch @@ -1,4 +1,4 @@ -From fb93392b0f4975a02775a608611dc9ceb20c06ad Mon Sep 17 00:00:00 2001 +From 299b5f36b85d4731568492f086f3d97be7f696a3 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Mon, 18 Jan 2010 17:59:07 +0000 Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a @@ -74,5 +74,5 @@ index 406a441082..917303dd92 100644 $(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in -- -2.24.1 +2.26.2 diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch index aed0f61..296b03a 100644 --- a/00189-use-rpm-wheels.patch +++ b/00189-use-rpm-wheels.patch @@ -1,4 +1,4 @@ -From 72d6cb277804f58b660bf96d8f5efff78d88491c Mon Sep 17 00:00:00 2001 +From 7297ecbd4225d5c6ed4433dc5f5a4f626cbebbff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 15 Aug 2018 15:36:29 +0200 Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels @@ -9,18 +9,19 @@ We keep them in /usr/share/python-wheels 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py -index fc0edec6e3..731817a3f0 100644 +index 566fb2a096..47da08d3d5 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py -@@ -1,16 +1,31 @@ +@@ -1,6 +1,7 @@ +import distutils.version +import glob import os import os.path -import pkgutil import sys + import runpy import tempfile - +@@ -8,10 +9,24 @@ import tempfile __all__ = ["version", "bootstrap"] @@ -47,7 +48,7 @@ index fc0edec6e3..731817a3f0 100644 _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), -@@ -95,13 +110,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False, +@@ -105,13 +120,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False, # additional paths that need added to sys.path additional_paths = [] for project, version in _PROJECTS: @@ -66,5 +67,5 @@ index fc0edec6e3..731817a3f0 100644 additional_paths.append(os.path.join(tmpdir, wheel_name)) -- -2.24.1 +2.26.2 diff --git a/00251-change-user-install-location.patch b/00251-change-user-install-location.patch index 49417d6..84037c9 100644 --- a/00251-change-user-install-location.patch +++ b/00251-change-user-install-location.patch @@ -1,4 +1,4 @@ -From a1f0ea8fae6fb87cdc9d9c16bc0898e8f66fa907 Mon Sep 17 00:00:00 2001 +From d80e90f32ce01beb284bd53f1b2b6d1aca7d58ec Mon Sep 17 00:00:00 2001 From: Michal Cyprian Date: Mon, 26 Jun 2017 16:32:56 +0200 Subject: [PATCH] 00251: Change user install location @@ -60,5 +60,5 @@ index 22d53fa562..9513526109 100644 if os.path.isdir(sitedir): addsitedir(sitedir, known_paths) -- -2.24.1 +2.26.2 diff --git a/00274-fix-arch-names.patch b/00274-fix-arch-names.patch index 6483d36..5dc509c 100644 --- a/00274-fix-arch-names.patch +++ b/00274-fix-arch-names.patch @@ -1,4 +1,4 @@ -From b60a8fee7e91e36b48a2ea27d1bb9f42642c3eb2 Mon Sep 17 00:00:00 2001 +From d487823c74f780ca1a09650d28680e348d7fb5cd Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 28 Aug 2017 17:16:46 +0200 Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change @@ -29,7 +29,7 @@ index ba37cf99e2..52a9ec6662 100755 ppc64le | powerpc64little) basic_machine=powerpc64le-unknown diff --git a/configure.ac b/configure.ac -index c59cbc223f..a3e1c04e1b 100644 +index 477a5ff1cb..aea27ef86a 100644 --- a/configure.ac +++ b/configure.ac @@ -747,9 +747,9 @@ cat >> conftest.c < Date: Thu, 11 Jul 2019 13:44:13 +0200 Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default @@ -51,5 +51,5 @@ index d4a68c9320..ed09874023 100644 return wrapper -- -2.24.1 +2.26.2 diff --git a/python3.spec b/python3.spec index 50eb2d8..c8b17d8 100644 --- a/python3.spec +++ b/python3.spec @@ -13,11 +13,11 @@ 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}.2 -#global prerel ... +%global general_version %{pybasever}.3 +%global prerel rc1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} License: Python @@ -1561,6 +1561,9 @@ CheckPython optimized # ====================================================== %changelog +* Thu Apr 30 2020 Miro Hrončok - 3.8.3~rc1-1 +- Rebased to 3.8.3rc1 + * Fri Feb 28 2020 Miro Hrončok - 3.8.2-2 - Enable https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup on power and arm diff --git a/sources b/sources index a375123..f469f54 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.8.2.tar.xz) = ca37ad0e7c5845f5f228566aa8ff654a8f428c7d4a5aaabff29baebb0ca3219b31ba8bb2607f89e37cf3fc564f023b8407e53a4f2c47bd99122c1cc222613e37 -SHA512 (Python-3.8.2.tar.xz.asc) = 765796ab5539576bbf1578e05cdb041dbc9a9ca0d6d2040a473a00a293b49f90be11ea6e33b47889da33b25f8e360fad4adeec292f0d43e5fae233d1f03bafd2 +SHA512 (Python-3.8.3rc1.tar.xz) = 3e886b784d0f389534966d79b4387d2e7c3f4aa0ad4eda1f8f041445e1b0122a3fd10c4c8e8c9f32f44b30464d5acf4e9fd6189f274bbf2bc11e6d91fc062662 +SHA512 (Python-3.8.3rc1.tar.xz.asc) = 27dc51f244a36739c18ef83a47ec8a182ff66c5baf74fe86fecdd78d4909803d20bd5d32ff9622610f2898cf1e131f8912e8ecce249142deda4d2e730b20bdd6