#60 Rebased to 3.8.3 final
Merged 3 years ago by churchyard. Opened 3 years ago by churchyard.
rpms/ thrnciar/python38 f31  into  f30

file modified
+3 -3
@@ -1,4 +1,4 @@ 

- From bf01d6c367d9cb8f6594afa87c16f0498ae7321f Mon Sep 17 00:00:00 2001

+ From 08c67bfedd07ebec54f5087b59045b8c78fa2a6d Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  Date: Wed, 13 Jan 2010 21:25:18 +0000

  Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
@@ -9,7 +9,7 @@ 

   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 @@ 

                      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

  

file modified
+9 -9
@@ -1,4 +1,4 @@ 

- From 96580364051672475607c88cdb31ec875cea6e97 Mon Sep 17 00:00:00 2001

+ From be6b9803109c3702dbff0ed8b0953913206008ca Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  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 @@ 

           '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 @@ 

           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 @@ 

   

   

  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 @@ 

   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 @@ 

                                  libraries=readline_libs))

           else:

  -- 

- 2.24.1

+ 2.26.2

  

file modified
+2 -2
@@ -1,4 +1,4 @@ 

- From fb93392b0f4975a02775a608611dc9ceb20c06ad Mon Sep 17 00:00:00 2001

+ From 50236468e82a7a19ed3dd7e13cb922e7d3e0ff7f Mon Sep 17 00:00:00 2001

  From: David Malcolm <dmalcolm@redhat.com>

  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 @@ 

   	$(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

  

file modified
+7 -6
@@ -1,4 +1,4 @@ 

- From 72d6cb277804f58b660bf96d8f5efff78d88491c Mon Sep 17 00:00:00 2001

+ From 36f1f2b4620b13bdc7ac1c349253ac07960c33b3 Mon Sep 17 00:00:00 2001

  From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

  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 @@ 

   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 @@ 

   

   _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 @@ 

               additional_paths.append(os.path.join(tmpdir, wheel_name))

   

  -- 

- 2.24.1

+ 2.26.2

  

@@ -1,4 +1,4 @@ 

- From a1f0ea8fae6fb87cdc9d9c16bc0898e8f66fa907 Mon Sep 17 00:00:00 2001

+ From 197b8de27ebcd17fc5dd51426a639950c6f6c284 Mon Sep 17 00:00:00 2001

  From: Michal Cyprian <m.cyprian@gmail.com>

  Date: Mon, 26 Jun 2017 16:32:56 +0200

  Subject: [PATCH] 00251: Change user install location
@@ -60,5 +60,5 @@ 

           if os.path.isdir(sitedir):

               addsitedir(sitedir, known_paths)

  -- 

- 2.24.1

+ 2.26.2

  

file modified
+3 -3
@@ -1,4 +1,4 @@ 

- From b60a8fee7e91e36b48a2ea27d1bb9f42642c3eb2 Mon Sep 17 00:00:00 2001

+ From 3172104314227af128f3ce68e9650663a7c1268c Mon Sep 17 00:00:00 2001

  From: Petr Viktorin <pviktori@redhat.com>

  Date: Mon, 28 Aug 2017 17:16:46 +0200

  Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
@@ -29,7 +29,7 @@ 

   	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 <<EOF
@@ -82,5 +82,5 @@ 

           s390x-linux-gnu

   # elif defined(__s390__)

  -- 

- 2.24.1

+ 2.26.2

  

@@ -1,4 +1,4 @@ 

- From 0d41a311e805af08637e3f6dc0fb6fae32e508ab Mon Sep 17 00:00:00 2001

+ From aedd897c6371bc54d3b2e2c9420fce6730c2acff Mon Sep 17 00:00:00 2001

  From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>

  Date: Thu, 11 Jul 2019 13:44:13 +0200

  Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default
@@ -51,5 +51,5 @@ 

       return wrapper

   

  -- 

- 2.24.1

+ 2.26.2

  

file modified
+4 -1
@@ -13,7 +13,7 @@ 

  

  #  WARNING  When rebasing to a new Python version,

  #           remember to update the python3-docs package as well

- %global general_version %{pybasever}.2

+ %global general_version %{pybasever}.3

  #global prerel ...

  %global upstream_version %{general_version}%{?prerel}

  Version: %{general_version}%{?prerel:~%{prerel}}
@@ -1570,6 +1570,9 @@ 

  # ======================================================

  

  %changelog

+ * Wed Feb 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.3-1

+ - Rebased to 3.8.3 final

+ 

  * Wed Feb 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8.2-1

  - Rebased to 3.8.2 final

  

file modified
+2 -2
@@ -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.3.tar.xz) = 3103bd8d944f3905eee3a2b52fd1f5c7dee380f9c5a99ad35a401fcba5a9117c3860ecec5cb47a92712c6549442fd2fa553a15c5657241dd09f5d00b9ed4f0f4

+ SHA512 (Python-3.8.3.tar.xz.asc) = ab39e148475391e4e149ee3a8290e8ba872c758697a4a0b677585875695d107dfcc03a7ab51c5c5f42d65ef779121047a78c61e7789bb1ea7405f9b58aa420f1