diff --git a/00178-dont-duplicate-flags-in-sysconfig.patch b/00178-dont-duplicate-flags-in-sysconfig.patch deleted file mode 100644 index 134cd59256cd0e9c2bf589defe515d3a6de4828c..0000000000000000000000000000000000000000 --- a/00178-dont-duplicate-flags-in-sysconfig.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 37feae5..dab8a09 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -375,7 +375,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 e3f79bf..bec4699 100644 ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py -@@ -301,7 +301,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: --- -1.8.3.1 - diff --git a/00205-make-libpl-respect-lib64.patch b/00205-make-libpl-respect-lib64.patch deleted file mode 100644 index e6fad4cc350b78ae4b7c5a10757fe6a4263ac752..0000000000000000000000000000000000000000 --- a/00205-make-libpl-respect-lib64.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Makefile.pre.in b/Makefile.pre.in -index dc763e7..e99f278 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1631,7 +1631,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 --- -1.8.3.1 - diff --git a/python3.spec b/python3.spec index 7b68a468fb3fa217dddf4c0acedbecfafe1307c5..f91eb6c95f247df99390479d70e45fbaddef856f 100644 --- a/python3.spec +++ b/python3.spec @@ -3,7 +3,7 @@ Summary: Interpreter of the Python3 programming language URL: https://www.python.org/ Version: 3.9.9 -Release: 5 +Release: 6 License: Python %global branchversion 3.9 @@ -87,8 +87,6 @@ Source1: pyconfig.h Patch1: 00001-rpath.patch Patch111: 00111-no-static-lib.patch -Patch178: 00178-dont-duplicate-flags-in-sysconfig.patch -Patch205: 00205-make-libpl-respect-lib64.patch Patch251: 00251-change-user-install-location.patch Patch6000: backport-Add--with-wheel-pkg-dir-configure-option.patch Patch6001: backport-bpo-46811-Make-test-suite-support-Expat-2.4.5.patch @@ -176,8 +174,6 @@ rm -r Modules/expat %patch1 -p1 %patch111 -p1 -%patch178 -p1 -%patch205 -p1 %patch251 -p1 %patch6000 -p1 %patch6001 -p1 @@ -797,6 +793,12 @@ export BEP_GTDLIST="$BEP_GTDLIST_TMP" %{_mandir}/*/* %changelog +* Wed Mar 09 2022 shixuantong - 3.9.9-6 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:delete unnecessary patches + * Mon Mar 07 2022 shixuantong - 3.9.9-5 - Type:bugfix - CVE:NA