diff --git a/00178-dont-duplicate-flags-in-sysconfig.patch b/00178-dont-duplicate-flags-in-sysconfig.patch deleted file mode 100644 index 72d665d..0000000 --- a/00178-dont-duplicate-flags-in-sysconfig.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e2f8cf627e31970ddb5134ade1d049ef0a5d8b96 Mon Sep 17 00:00:00 2001 -From: Bohuslav Kabrda -Date: Fri, 19 Jun 2020 16:11:14 +0200 -Subject: [PATCH] 00178: Don't duplicate various FLAGS in sysconfig values - -http://bugs.python.org/issue17679 - -Co-Authored-By: Bohuslav Kabrda ---- - Lib/distutils/sysconfig.py | 5 ++++- - Lib/sysconfig.py | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index ff0b131df2..2013efaa8b 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -356,7 +356,10 @@ def parse_makefile(fn, g=None): - done[n] = item = "" - if found: - after = value[m.end():] -- value = value[:m.start()] + item + after -+ value = value[:m.start()] -+ if item.strip() not in value: -+ value += item -+ value += after - if "$" in after: - notdone[name] = value - else: -diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 8168e9c5a9..240bb6608a 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -294,7 +294,10 @@ def _parse_makefile(filename, vars=None): - - if found: - after = value[m.end():] -- value = value[:m.start()] + item + after -+ value = value[:m.start()] -+ if item.strip() not in value: -+ value += item -+ value += after - if "$" in after: - notdone[name] = value - else: --- -2.26.2 - diff --git a/python3.6.spec b/python3.6.spec index 1889b92..928da55 100644 --- a/python3.6.spec +++ b/python3.6.spec @@ -17,7 +17,7 @@ URL: https://www.python.org/ %global prerel rc1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} License: Python @@ -311,12 +311,6 @@ Patch163: 00163-disable-parts-of-test_socket-in-rpm-build.patch # See https://bugzilla.redhat.com/show_bug.cgi?id=614680 Patch170: 00170-gc-assertions.patch -# 00178 # -# Don't duplicate various FLAGS in sysconfig values -# http://bugs.python.org/issue17679 -# Does not affect python2 AFAICS (different sysconfig values initialization) -Patch178: 00178-dont-duplicate-flags-in-sysconfig.patch - # 00189 # # Instead of bundled wheels, use our RPM packaged wheels from # /usr/share/python-wheels @@ -639,7 +633,6 @@ rm -r Modules/zlib %patch160 -p1 %patch163 -p1 %patch170 -p1 -%patch178 -p1 %if %{with rpmwheels} %patch189 -p1 @@ -1535,6 +1528,11 @@ CheckPython optimized # ====================================================== %changelog +* Thu Jun 25 2020 Victor Stinner - 3.6.11~rc1-2 +- Remove downstream 00178-dont-duplicate-flags-in-sysconfig.patch which + introduced a bug on distutils.sysconfig.get_config_var('LIBPL') + (rhbz#1851008). + * Fri Jun 19 2020 Petr Viktorin - 3.6.11-1 - Update to 3.6.11rc1