diff --git a/00102-lib64.patch b/00102-lib64.patch index 2b913ca..6111c0f 100644 --- a/00102-lib64.patch +++ b/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/00205-make-libpl-respect-lib64.patch b/00205-make-libpl-respect-lib64.patch deleted file mode 100644 index 3e7c797..0000000 --- a/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/python36.spec b/python36.spec index cc2c72c..c0335f4 100644 --- a/python36.spec +++ b/python36.spec @@ -17,7 +17,7 @@ URL: https://www.python.org/ #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 5%{?dist} License: Python @@ -322,11 +322,6 @@ Patch178: 00178-dont-duplicate-flags-in-sysconfig.patch # /usr/share/python-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 @@ -651,7 +646,6 @@ rm -r Modules/zlib rm Lib/ensurepip/_bundled/*.whl %endif -%patch205 -p1 %patch251 -p1 %patch262 -p1 %patch274 -p1 @@ -1535,6 +1529,9 @@ CheckPython optimized # ====================================================== %changelog +* Thu May 28 2020 Victor Stinner - 3.6.10-5 +- Fix python3-config --configdir (rhbz#1772988). + * Thu Jan 30 2020 Fedora Release Engineering - 3.6.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild