diff --git a/00001-rpath.patch b/00001-rpath.patch index b7248a9..1fcbcec 100644 --- a/00001-rpath.patch +++ b/00001-rpath.patch @@ -1,4 +1,4 @@ -From 96f709265ee207c0aab9023e9fc969bdc5e944a9 Mon Sep 17 00:00:00 2001 +From 45b72bdeac12c9243667f94a07f46a7944b95a92 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 @@ -29,5 +29,5 @@ index 4d7a6de740..353086a648 100644 include_dirs=None, extra_preargs=None, extra_postargs=None): fixed_args = self._fix_compile_args(None, macros, include_dirs) -- -2.26.2 +2.23.0 diff --git a/00102-lib64.patch b/00102-lib64.patch index f85c3f3..64d394f 100644 --- a/00102-lib64.patch +++ b/00102-lib64.patch @@ -1,4 +1,4 @@ -From b4cc171c0e08afc582d96ab45c12b4fb4c7da341 Mon Sep 17 00:00:00 2001 +From dca4d618f872be4ec9509a96707d86f6a6988256 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/ @@ -87,7 +87,7 @@ index 287ab1989e..d4c05e0ab1 100644 check_path(cmd.install_headers, os.path.join(destination, "include", "python", "foopkg")) diff --git a/Lib/site.py b/Lib/site.py -index a065ab0b5d..22d53fa562 100644 +index 9fa21cca38..2e24e86988 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -335,11 +335,15 @@ def getsitepackages(prefixes=None): @@ -139,7 +139,7 @@ index b9e2fafbc0..0ae6d35b69 100644 'scripts': '{userbase}/bin', 'data': '{userbase}', diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py -index 1bbc697936..9a7e80dfa0 100644 +index 9a047fd466..31c6f283e9 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -267,8 +267,8 @@ class HelperFunctionsTests(unittest.TestCase): @@ -230,7 +230,7 @@ index 18a044629a..b1c80869e4 100644 AC_SUBST(LIBPL) diff --git a/setup.py b/setup.py -index b168ed4082..8628b9d1cd 100644 +index 6340669fff..84f73008e0 100644 --- a/setup.py +++ b/setup.py @@ -649,7 +649,7 @@ class PyBuildExt(build_ext): @@ -257,5 +257,5 @@ index b168ed4082..8628b9d1cd 100644 libraries=readline_libs)) else: -- -2.26.2 +2.23.0 diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch index 7d7e074..917027b 100644 --- a/00111-no-static-lib.patch +++ b/00111-no-static-lib.patch @@ -1,4 +1,4 @@ -From 980d366e4d1422de9d91723c8a33632861d5309b Mon Sep 17 00:00:00 2001 +From 7a3151c7bc83b67bd30cd9acb1d91118e7d32eae 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.26.2 +2.23.0 diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch index c82d5b6..eebd0c5 100644 --- a/00189-use-rpm-wheels.patch +++ b/00189-use-rpm-wheels.patch @@ -1,4 +1,4 @@ -From 22960e3e57a040a4695a0e020dbf7536bffb9ee6 Mon Sep 17 00:00:00 2001 +From e34c7e188861647f2c9260a30da8d4b7cfb95c37 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 @@ -67,5 +67,5 @@ index f3152a55d4..f58dab1800 100644 additional_paths.append(os.path.join(tmpdir, wheel_name)) -- -2.26.2 +2.23.0 diff --git a/00251-change-user-install-location.patch b/00251-change-user-install-location.patch index d1f860a..54a4c19 100644 --- a/00251-change-user-install-location.patch +++ b/00251-change-user-install-location.patch @@ -1,4 +1,4 @@ -From c000bc02e571e68c35527f1d3280363ef337431b Mon Sep 17 00:00:00 2001 +From 8a62a97b989692c68470745193581e6dff599044 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 @@ -40,7 +40,7 @@ index ae4f915669..0e4fd5b74a 100644 else: if self.exec_prefix is None: diff --git a/Lib/site.py b/Lib/site.py -index 22d53fa562..9513526109 100644 +index 2e24e86988..2581269999 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -348,7 +348,14 @@ def getsitepackages(prefixes=None): @@ -60,5 +60,5 @@ index 22d53fa562..9513526109 100644 if os.path.isdir(sitedir): addsitedir(sitedir, known_paths) -- -2.26.2 +2.23.0 diff --git a/00274-fix-arch-names.patch b/00274-fix-arch-names.patch index 78f6403..681df44 100644 --- a/00274-fix-arch-names.patch +++ b/00274-fix-arch-names.patch @@ -1,4 +1,4 @@ -From 4b55be571b62497e95192fb45de1f0a8b9807ea8 Mon Sep 17 00:00:00 2001 +From 1fe3664603effb33b8a89930f6705d2391ad03bc 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 @@ -82,5 +82,5 @@ index b1c80869e4..de4627e236 100644 s390x-linux-gnu # elif defined(__s390__) -- -2.26.2 +2.23.0 diff --git a/00328-pyc-timestamp-invalidation-mode.patch b/00328-pyc-timestamp-invalidation-mode.patch index c0872a1..7c10c04 100644 --- a/00328-pyc-timestamp-invalidation-mode.patch +++ b/00328-pyc-timestamp-invalidation-mode.patch @@ -1,4 +1,4 @@ -From 1c98aeef1c255231b25eda7e0907b0c15dcf9887 Mon Sep 17 00:00:00 2001 +From b7b76bfde0f5ac75978327836b8d32584b968547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= 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.26.2 +2.23.0 diff --git a/python3.spec b/python3.spec index 4b0bbb2..40efc5d 100644 --- a/python3.spec +++ b/python3.spec @@ -14,7 +14,7 @@ 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}.4 -%global prerel rc1 +#global prerel rc1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} Release: 1%{?dist} @@ -1567,6 +1567,9 @@ CheckPython optimized # ====================================================== %changelog +* Tue Jul 14 2020 Tomas Hrnciar - 3.8.4-1 +- Update to 3.8.4 + * Tue Jun 30 2020 Miro Hrončok - 3.8.4~rc1-1 - Rebased to 3.8.4rc1 diff --git a/sources b/sources index b7086bb..7faf41f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.8.4rc1.tar.xz) = 8b86a3f79d9343c853ccdde5dba562c32f4cb3e574cbad416998caa39879e72d753036f33ac93e8cd9eb8ade1d685bc1a8fed586521ee5971f34e25cb5b875ad -SHA512 (Python-3.8.4rc1.tar.xz.asc) = 95d1b345f23a185b4ef54c7d12eb209cdc658269d362309fb6f4e76911df8688bd1a37f176b5c41febf675b8198e947dcc4310d017cd2c9c4cd1aba16cb0921b +SHA512 (Python-3.8.4.tar.xz) = 37a36d014a8372742be9d0bd9dd3a275e100dc21b1515c145bc62425d4d157327b6e63ad99bc888c0b36c1da4c05676c40eb086e75072d1906e3210ec3043dcb +SHA512 (Python-3.8.4.tar.xz.asc) = eabf5e26184bb84f763f899fd2148e7d456765dfb584d52cbb15a3ce7619f84c3b3ddab4c9f1dc619bab17c7d24e0888db41ef435ce95ff9494122d6844ef3ce