From 18c1354aaabc21d5d24eef0754aea8f1c50cd20c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 14 2020 01:49:35 +0000
Subject: import python3-3.6.8-30.el8


---

diff --git a/SOURCES/00102-lib64.patch b/SOURCES/00102-lib64.patch
index 2b913ca..6111c0f 100644
--- a/SOURCES/00102-lib64.patch
+++ b/SOURCES/00102-lib64.patch
@@ -200,3 +200,19 @@ index 0f2dfc4..da37896 100644
                                       ] )
  
          if (ssl_incs is not None and
+diff --git a/configure.ac b/configure.ac
+index 01c66fe..1e6d515 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4772,9 +4772,9 @@ AC_MSG_RESULT($LDVERSION)
+ dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
+ AC_SUBST(PY_ENABLE_SHARED)
+ if test x$PLATFORM_TRIPLET = x; then
+-  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}"
++  LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}"
+ else
+-  LIBPL='$(prefix)'"/lib/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
++  LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
+ fi
+ AC_SUBST(LIBPL)
+
diff --git a/SOURCES/00178-dont-duplicate-flags-in-sysconfig.patch b/SOURCES/00178-dont-duplicate-flags-in-sysconfig.patch
deleted file mode 100644
index fc49b30..0000000
--- a/SOURCES/00178-dont-duplicate-flags-in-sysconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -r 39b9b05c3085 Lib/distutils/sysconfig.py
---- a/Lib/distutils/sysconfig.py	Wed Apr 10 00:27:23 2013 +0200
-+++ b/Lib/distutils/sysconfig.py	Wed Apr 10 10:14:18 2013 +0200
-@@ -362,7 +362,10 @@
-                     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 -r 39b9b05c3085 Lib/sysconfig.py
---- a/Lib/sysconfig.py	Wed Apr 10 00:27:23 2013 +0200
-+++ b/Lib/sysconfig.py	Wed Apr 10 10:14:18 2013 +0200
-@@ -296,7 +296,10 @@
- 
-                 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/SOURCES/00205-make-libpl-respect-lib64.patch b/SOURCES/00205-make-libpl-respect-lib64.patch
deleted file mode 100644
index 3e7c797..0000000
--- a/SOURCES/00205-make-libpl-respect-lib64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up Python-3.5.0/Makefile.pre.in.lib Python-3.5.0/Makefile.pre.in
---- Python-3.5.0/Makefile.pre.in.lib	2015-09-21 15:39:47.928286620 +0200
-+++ Python-3.5.0/Makefile.pre.in	2015-09-21 15:42:58.004042762 +0200
-@@ -1340,7 +1340,7 @@ inclinstall:
- 
- # Install the library and miscellaneous stuff needed for extending/embedding
- # This goes into $(exec_prefix)
--LIBPL=		@LIBPL@
-+LIBPL=		$(LIBDEST)/config-$(LDVERSION)-$(MULTIARCH)
- 
- # pkgconfig directory
- LIBPC=		$(LIBDIR)/pkgconfig
diff --git a/SPECS/python3.spec b/SPECS/python3.spec
index e26fcfe..056dc0f 100644
--- a/SPECS/python3.spec
+++ b/SPECS/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
 Version: %{pybasever}.8
-Release: 28%{?dist}
+Release: 30%{?dist}
 License: Python
 
 
@@ -309,22 +309,11 @@ 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/python3-wheels
 Patch189: 00189-use-rpm-wheels.patch
 
-# 00205 #
-# LIBPL variable in makefile takes LIBPL from configure.ac
-# but the LIBPL variable defined there doesn't respect libdir macro
-Patch205: 00205-make-libpl-respect-lib64.patch
-
 # 00251
 # Set values of prefix and exec_prefix in distutils install command
 # to /usr/local if executable is /usr/bin/python* and RPM build
@@ -802,14 +791,12 @@ rm -r Modules/zlib
 %patch160 -p1
 %patch163 -p1
 %patch170 -p1
-%patch178 -p1
 
 %if %{with rpmwheels}
 %patch189 -p1
 rm Lib/ensurepip/_bundled/*.whl
 %endif
 
-%patch205 -p1
 %patch251 -p1
 %patch262 -p1
 %patch274 -p1
@@ -1748,6 +1735,14 @@ fi
 # ======================================================
 
 %changelog
+* Thu Jun 25 2020 Victor Stinner <vstinner@python.org> - 3.6.8-30
+- Remove downstream 00178-dont-duplicate-flags-in-sysconfig.patch which
+  introduced a bug on distutils.sysconfig.get_config_var('LIBPL')
+  (rhbz#1851090).
+
+* Thu Jun 18 2020 Victor Stinner <vstinner@python.org> - 3.6.8-29
+- Fix python3-config --configdir (rhbz#1772992).
+
 * Fri Apr 03 2020 Charalampos Stratakis <cstratak@redhat.com> - 3.6.8-28
 - Security fix for CVE-2020-8492
 Resolves: rhbz#1810618