[packages/python3] Up to 3.13.0

arekm arekm at pld-linux.org
Tue Oct 8 14:02:52 CEST 2024


commit 02d39b3f1a50ccc938e616a52e64a481559e567c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Oct 8 13:12:11 2024 +0200

    Up to 3.13.0

 python3-BLDLIBRARY.patch         |  72 +++++++++++-----------
 python3-installcompile.patch     |   9 +--
 python3-multilib.patch           |  78 ++++++++++++------------
 python3-no-randomize-tests.patch |  10 ---
 python3-pythonpath.patch         |  12 ----
 python3.spec                     | 127 +++++++++------------------------------
 6 files changed, 107 insertions(+), 201 deletions(-)
---
diff --git a/python3.spec b/python3.spec
index 238edd0..e942d9d 100644
--- a/python3.spec
+++ b/python3.spec
@@ -9,9 +9,9 @@
 %bcond_without	optimizations		# expensive, stable optimizations (PGO etc.) + LTO
 #
 # tests which will not work on 64-bit platforms
-%define		no64bit_tests	-x test_audioop -x test_rgbimg -x test_imageop
+%define		no64bit_tests	-x test_rgbimg -x test_imageop
 # tests which may fail because of builder environment limitations (no /proc or /dev/pts)
-%define		nobuilder_tests -u-network -x test_resource -x test_openpty -x test_socket -x test_nis -x test_posix -x test_locale -x test_pty -x test_asyncio -x test_os -x test_readline -x test_normalization
+%define		nobuilder_tests -u-network -x test_resource -x test_openpty -x test_socket -x test_posix -x test_locale -x test_pty -x test_asyncio -x test_os -x test_readline -x test_normalization
 
 # tests which fail because of some unknown/unresolved reason (this list should be %%{nil})
 #   test_site: fails because our site.py is patched to include both /usr/share/... and /usr/lib...
@@ -21,7 +21,7 @@
 %define		broken_tests_x32	-x test_time
 %undefine	with_optimizations
 %endif
-%define		broken_tests	-x test_embed -x test_nntplib -x test_gdb -x test_site -x test_ssl %{?broken_tests_x32}
+%define		broken_tests	-x test_embed -x test_gdb -x test_site -x test_ssl %{?broken_tests_x32}
 
 %ifarch armv6hl armv7hl armv7hnl
 %define		_python_target_abi	%{?_gnu}hf
@@ -29,7 +29,7 @@
 %define		_python_target_abi	%{?_gnu}
 %endif
 
-%define py_ver		3.12
+%define py_ver		3.13
 %define py_abi		%{py_ver}
 %define	py_platform	%{py_abi}-%{_target_base_arch}-%{_target_os}%{?_python_target_abi}
 %define py_prefix	%{_prefix}
@@ -47,15 +47,14 @@ Summary(ru.UTF-8):	Язык программирования очень высо
 Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python3
-Version:	%{py_ver}.7
+Version:	%{py_ver}.0
 Release:	0.1
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
 Source0:	https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-# Source0-md5:	c6c933c1a0db52597cb45a7910490f93
+# Source0-md5:	726e5b829fcf352326874c1ae599abaa
 Source1:	pyconfig.h.in
-Patch0:		%{name}-pythonpath.patch
 
 Patch2:		%{name}-multilib.patch
 Patch3:		%{name}-no_cmdline_tests.patch
@@ -66,7 +65,6 @@ Patch9:		%{name}-tests_with_pythonpath.patch
 
 Patch11:	%{name}-installcompile.patch
 
-Patch13:	%{name}-no-randomize-tests.patch
 Patch14:	python3-profile-tests.patch
 Patch15:	python3-tests.patch
 URL:		https://www.python.org/
@@ -361,30 +359,6 @@ Python development tools such as profilers and debugger.
 Narzędzia programistyczne języka Python takie jak profiler oraz
 debugger.
 
-%package 2to3
-Summary:	Automated Python 2 to 3 code translation
-Summary(pl.UTF-8):	Automatyczne tłumaczenie kodu Pythona 2 do 3
-Group:		Development/Languages/Python
-
-%description 2to3
-2to3 is a Python program that reads Python 2.x source code and applies
-a series of fixers to transform it into valid Python 3.x code. The
-standard library contains a rich set of fixers that will handle almost
-all code. 2to3 supporting library lib2to3 is, however, a flexible and
-generic library, so it is possible to write your own fixers for 2to3.
-lib2to3 could also be adapted to custom applications in which Python
-code needs to be edited automatically.
-
-%description 2to3 -l pl.UTF-8
-2to3 to program w Pythonie czytający od źródłowy w Pythonie 2.x i
-aplikujący serię poprawek przekształcających go w poprawny kod w
-Pythonie 3.x. Biblioteka standardowa zawiera duży zbiór poprawek
-obsługujących większość kodu. Biblioteka wspierająca 2to3 (lib2to3)
-jest jednak elastyczną i ogólną biblioteką, więc można pisać własne
-poprawki dla 2to3. lib2to3 można także zaadaptować na potrzeby
-własnych zastosowań, w których kod w Pythonie musi być modyfikowany
-automatycznie.
-
 %package static
 Summary:	Static python library
 Summary(pl.UTF-8):	Statyczna biblioteka Pythona
@@ -483,7 +457,6 @@ Moduły testowe dla Pythona.
 
 %prep
 %setup -q -n Python-%{version}
-%patch0 -p1
 
 %patch2 -p1
 %patch3 -p1
@@ -494,7 +467,6 @@ Moduły testowe dla Pythona.
 
 %patch11 -p1
 
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 
@@ -513,7 +485,6 @@ sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' -e '1s,#!\s
 
 sed -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
       Tools/scripts/idle3 \
-      Tools/scripts/2to3 \
       Tools/scripts/pydoc3
 
 find . -name '*.py' | xargs -r grep -El '^#! */usr/bin/env python3?' | xargs %{__sed} -i -e '1s,^#! */usr/bin/env python3\?,#!/usr/bin/python3,'
@@ -551,7 +522,6 @@ export SETUPTOOLS_USE_DISTUTILS=stdlib
 	%{?with_debug:--with-pydebug} \
         --with-ssl-default-suites=openssl \
 	--with-system-expat \
-	--with-system-ffi \
 	%{?with_system_mpdecimal:--with-system-libmpdec} \
 %if %{with optimizations}
 	--enable-optimizations \
@@ -657,9 +627,6 @@ install -p Tools/patchcheck/reindent.py $RPM_BUILD_ROOT%{_bindir}/pyreindent%{py
 %{__rm} $RPM_BUILD_ROOT%{py_libdir}/idlelib/help.html
 %{__rm} $RPM_BUILD_ROOT%{py_libdir}/site-packages/README.txt
 
-# currently provided by python-2to3, consider switching to this one
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/2to3
-
 # that seems to be only an empty extension template,
 # which seems to be built only {with tests}
 %{__rm} $RPM_BUILD_ROOT%{py_dyndir}/xxlimited*.*.so
@@ -738,7 +705,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/site.py
 %{py_libdir}/sre_*.py
 %{py_libdir}/stat.py
-%{py_libdir}/sysconfig.py
 %{py_libdir}/token.py
 %{py_libdir}/tokenize.py
 %{py_libdir}/traceback.py
@@ -768,7 +734,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/site.cpython-*.py[co]
 %{py_libdir}/__pycache__/sre_*.cpython-*.py[co]
 %{py_libdir}/__pycache__/stat.cpython-*.py[co]
-%{py_libdir}/__pycache__/sysconfig.cpython-*.py[co]
 %{py_libdir}/__pycache__/token.cpython-*.py[co]
 %{py_libdir}/__pycache__/tokenize.cpython-*.py[co]
 %{py_libdir}/__pycache__/traceback.cpython-*.py[co]
@@ -776,12 +741,10 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/os.cpython-*.py[co]
 %{py_libdir}/__pycache__/types.cpython-*.py[co]
 
+# main modules needed by core python
 %{py_libdir}/collections
-
-# encodings required by python library
-%dir %{py_libdir}/encodings
-%{py_libdir}/encodings/__pycache__
-%{py_libdir}/encodings/*.py
+%{py_libdir}/encodings
+%{py_libdir}/sysconfig
 
 %dir %{py_libdir}/config-%{py_platform}
 %{py_libdir}/config-%{py_platform}/Makefile
@@ -795,9 +758,13 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__future__.py
 %{py_libdir}/__hello__.py
 %{py_libdir}/_aix_support.py
+%{py_libdir}/_android_support.py
+%{py_libdir}/_colorize.py
 %{py_libdir}/_compat_pickle.py
 %{py_libdir}/_compression.py
+%{py_libdir}/_ios_support.py
 %{py_libdir}/_markupbase.py
+%{py_libdir}/_opcode_metadata.py
 %{py_libdir}/_osx_support.py
 %{py_libdir}/_pydecimal.py
 %{py_libdir}/_py_abc.py
@@ -806,7 +773,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/_pylong.py
 %{py_libdir}/_strptime.py
 %{py_libdir}/_threading_local.py
-%{py_libdir}/aifc.py
 %{py_libdir}/antigravity.py
 %{py_libdir}/argparse.py
 %{py_libdir}/ast.py
@@ -815,9 +781,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/bz2.py
 %{py_libdir}/cProfile.py
 %{py_libdir}/calendar.py
-%{py_libdir}/cgi.py
-%{py_libdir}/cgitb.py
-%{py_libdir}/chunk.py
 %{py_libdir}/cmd.py
 %{py_libdir}/code.py
 %{py_libdir}/codeop.py
@@ -827,7 +790,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/contextlib.py
 %{py_libdir}/contextvars.py
 %{py_libdir}/copy.py
-%{py_libdir}/crypt.py
 %{py_libdir}/csv.py
 %{py_libdir}/dataclasses.py
 %{py_libdir}/datetime.py
@@ -849,26 +811,21 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/hashlib.py
 %{py_libdir}/hmac.py
 %{py_libdir}/imaplib.py
-%{py_libdir}/imghdr.py
 %{py_libdir}/inspect.py
 %{py_libdir}/ipaddress.py
 %{py_libdir}/lzma.py
 %{py_libdir}/mailbox.py
-%{py_libdir}/mailcap.py
 %{py_libdir}/mimetypes.py
 %{py_libdir}/modulefinder.py
 %{py_libdir}/netrc.py
-%{py_libdir}/nntplib.py
 %{py_libdir}/ntpath.py
 %{py_libdir}/nturl2path.py
 %{py_libdir}/numbers.py
 %{py_libdir}/opcode.py
 %{py_libdir}/optparse.py
-%{py_libdir}/pathlib.py
 %{py_libdir}/pdb.py
 %{py_libdir}/pickle.py
 %{py_libdir}/pickletools.py
-%{py_libdir}/pipes.py
 %{py_libdir}/pkgutil.py
 %{py_libdir}/platform.py
 %{py_libdir}/plistlib.py
@@ -892,7 +849,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/shutil.py
 %{py_libdir}/signal.py
 %{py_libdir}/smtplib.py
-%{py_libdir}/sndhdr.py
 %{py_libdir}/socket.py
 %{py_libdir}/socketserver.py
 %{py_libdir}/ssl.py
@@ -901,11 +857,9 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/stringprep.py
 %{py_libdir}/struct.py
 %{py_libdir}/subprocess.py
-%{py_libdir}/sunau.py
 %{py_libdir}/symtable.py
 %{py_libdir}/tabnanny.py
 %{py_libdir}/tarfile.py
-%{py_libdir}/telnetlib.py
 %{py_libdir}/tempfile.py
 %{py_libdir}/textwrap.py
 %{py_libdir}/this.py
@@ -915,20 +869,22 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/tty.py
 %{py_libdir}/turtle.py
 %{py_libdir}/typing.py
-%{py_libdir}/uu.py
 %{py_libdir}/uuid.py
 %{py_libdir}/warnings.py
 %{py_libdir}/wave.py
 %{py_libdir}/webbrowser.py
-%{py_libdir}/xdrlib.py
 %{py_libdir}/zipapp.py
 %{py_libdir}/zipimport.py
 %{py_libdir}/__pycache__/__future__.cpython-*.py[co]
 %{py_libdir}/__pycache__/__hello__.cpython-*.py[co]
 %{py_libdir}/__pycache__/_aix_support.cpython-*.py[co]
+%{py_libdir}/__pycache__/_android_support.cpython-*.py[co]
+%{py_libdir}/__pycache__/_colorize.cpython-*.py[co]
 %{py_libdir}/__pycache__/_compat_pickle.cpython-*.py[co]
 %{py_libdir}/__pycache__/_compression.cpython-*.py[co]
+%{py_libdir}/__pycache__/_ios_support.cpython-*.py[co]
 %{py_libdir}/__pycache__/_markupbase.cpython-*.py[co]
+%{py_libdir}/__pycache__/_opcode_metadata.cpython-*.py[co]
 %{py_libdir}/__pycache__/_osx_support.cpython-*.py[co]
 %{py_libdir}/__pycache__/_pydecimal.cpython-*.py[co]
 %{py_libdir}/__pycache__/_py_abc.cpython-*.py[co]
@@ -937,7 +893,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/_pylong.cpython-*.py[co]
 %{py_libdir}/__pycache__/_strptime.cpython-*.py[co]
 %{py_libdir}/__pycache__/_threading_local.cpython-*.py[co]
-%{py_libdir}/__pycache__/aifc.cpython-*.py[co]
 %{py_libdir}/__pycache__/antigravity.cpython-*.py[co]
 %{py_libdir}/__pycache__/argparse.cpython-*.py[co]
 %{py_libdir}/__pycache__/ast.cpython-*.py[co]
@@ -946,9 +901,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/bz2.cpython-*.py[co]
 %{py_libdir}/__pycache__/cProfile.cpython-*.py[co]
 %{py_libdir}/__pycache__/calendar.cpython-*.py[co]
-%{py_libdir}/__pycache__/cgi.cpython-*.py[co]
-%{py_libdir}/__pycache__/cgitb.cpython-*.py[co]
-%{py_libdir}/__pycache__/chunk.cpython-*.py[co]
 %{py_libdir}/__pycache__/cmd.cpython-*.py[co]
 %{py_libdir}/__pycache__/code.cpython-*.py[co]
 %{py_libdir}/__pycache__/codeop.cpython-*.py[co]
@@ -958,7 +910,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/contextlib.cpython-*.py[co]
 %{py_libdir}/__pycache__/contextvars.cpython-*.py[co]
 %{py_libdir}/__pycache__/copy.cpython-*.py[co]
-%{py_libdir}/__pycache__/crypt.cpython-*.py[co]
 %{py_libdir}/__pycache__/csv.cpython-*.py[co]
 %{py_libdir}/__pycache__/dataclasses.cpython-*.py[co]
 %{py_libdir}/__pycache__/datetime.cpython-*.py[co]
@@ -980,26 +931,21 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/hashlib.cpython-*.py[co]
 %{py_libdir}/__pycache__/hmac.cpython-*.py[co]
 %{py_libdir}/__pycache__/imaplib.cpython-*.py[co]
-%{py_libdir}/__pycache__/imghdr.cpython-*.py[co]
 %{py_libdir}/__pycache__/inspect.cpython-*.py[co]
 %{py_libdir}/__pycache__/ipaddress.cpython-*.py[co]
 %{py_libdir}/__pycache__/lzma.cpython-*.py[co]
 %{py_libdir}/__pycache__/mailbox.cpython-*.py[co]
-%{py_libdir}/__pycache__/mailcap.cpython-*.py[co]
 %{py_libdir}/__pycache__/mimetypes.cpython-*.py[co]
 %{py_libdir}/__pycache__/modulefinder.cpython-*.py[co]
 %{py_libdir}/__pycache__/netrc.cpython-*.py[co]
-%{py_libdir}/__pycache__/nntplib.cpython-*.py[co]
 %{py_libdir}/__pycache__/ntpath.cpython-*.py[co]
 %{py_libdir}/__pycache__/nturl2path.cpython-*.py[co]
 %{py_libdir}/__pycache__/numbers.cpython-*.py[co]
 %{py_libdir}/__pycache__/opcode.cpython-*.py[co]
 %{py_libdir}/__pycache__/optparse.cpython-*.py[co]
-%{py_libdir}/__pycache__/pathlib.cpython-*.py[co]
 %{py_libdir}/__pycache__/pdb.cpython-*.py[co]
 %{py_libdir}/__pycache__/pickle.cpython-*.py[co]
 %{py_libdir}/__pycache__/pickletools.cpython-*.py[co]
-%{py_libdir}/__pycache__/pipes.cpython-*.py[co]
 %{py_libdir}/__pycache__/pkgutil.cpython-*.py[co]
 %{py_libdir}/__pycache__/platform.cpython-*.py[co]
 %{py_libdir}/__pycache__/plistlib.cpython-*.py[co]
@@ -1023,7 +969,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/shutil.cpython-*.py[co]
 %{py_libdir}/__pycache__/signal.cpython-*.py[co]
 %{py_libdir}/__pycache__/smtplib.cpython-*.py[co]
-%{py_libdir}/__pycache__/sndhdr.cpython-*.py[co]
 %{py_libdir}/__pycache__/socket.cpython-*.py[co]
 %{py_libdir}/__pycache__/socketserver.cpython-*.py[co]
 %{py_libdir}/__pycache__/ssl.cpython-*.py[co]
@@ -1032,11 +977,9 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/stringprep.cpython-*.py[co]
 %{py_libdir}/__pycache__/struct.cpython-*.py[co]
 %{py_libdir}/__pycache__/subprocess.cpython-*.py[co]
-%{py_libdir}/__pycache__/sunau.cpython-*.py[co]
 %{py_libdir}/__pycache__/symtable.cpython-*.py[co]
 %{py_libdir}/__pycache__/tabnanny.cpython-*.py[co]
 %{py_libdir}/__pycache__/tarfile.cpython-*.py[co]
-%{py_libdir}/__pycache__/telnetlib.cpython-*.py[co]
 %{py_libdir}/__pycache__/tempfile.cpython-*.py[co]
 %{py_libdir}/__pycache__/textwrap.cpython-*.py[co]
 %{py_libdir}/__pycache__/this.cpython-*.py[co]
@@ -1046,12 +989,10 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/__pycache__/tty.cpython-*.py[co]
 %{py_libdir}/__pycache__/turtle.cpython-*.py[co]
 %{py_libdir}/__pycache__/typing.cpython-*.py[co]
-%{py_libdir}/__pycache__/uu.cpython-*.py[co]
 %{py_libdir}/__pycache__/uuid.cpython-*.py[co]
 %{py_libdir}/__pycache__/warnings.cpython-*.py[co]
 %{py_libdir}/__pycache__/wave.cpython-*.py[co]
 %{py_libdir}/__pycache__/webbrowser.cpython-*.py[co]
-%{py_libdir}/__pycache__/xdrlib.cpython-*.py[co]
 %{py_libdir}/__pycache__/zipapp.cpython-*.py[co]
 %{py_libdir}/__pycache__/zipimport.cpython-*.py[co]
 
@@ -1070,7 +1011,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_dyndir}/_codecs_kr.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_codecs_tw.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_contextvars.cpython-*.so
-%attr(755,root,root) %{py_dyndir}/_crypt.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_csv.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_ctypes*.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_curses_panel.cpython-*.so
@@ -1084,6 +1024,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_dyndir}/_gdbm.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_hashlib.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_heapq.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_interpchannels.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_interpqueues.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_interpreters.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_json.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_lsprof.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_lzma.cpython-*.so
@@ -1105,35 +1048,33 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_dyndir}/_testbuffer.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_testcapi.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_testclinic.cpython-*.so
-%attr(755,root,root) %{py_dyndir}/_testinternalcapi.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_testclinic_limited.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_testexternalinspection.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_testimportmultiple.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_testinternalcapi.cpython-*.so
+%attr(755,root,root) %{py_dyndir}/_testlimitedcapi.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_testmultiphase.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_testsinglephase.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_uuid.cpython-*.so
-%attr(755,root,root) %{py_dyndir}/_xxinterpchannels.cpython-*.so
-%attr(755,root,root) %{py_dyndir}/_xxsubinterpreters.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/_xxtestfuzz.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/array.cpython-*.so
-%attr(755,root,root) %{py_dyndir}/audioop.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/binascii.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/cmath.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/fcntl.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/grp.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/math.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/mmap.cpython-*.so
-%attr(755,root,root) %{py_dyndir}/nis.cpython-*.so
-%attr(755,root,root) %{py_dyndir}/ossaudiodev.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/pyexpat.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/readline.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/resource.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/select.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/syslog.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/termios.cpython-*.so
-%attr(755,root,root) %{py_dyndir}/spwd.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/unicodedata.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/xxsubtype.cpython-*.so
 %attr(755,root,root) %{py_dyndir}/zlib.cpython-*.so
 
+%{py_libdir}/_pyrepl
 %{py_libdir}/__phello__
 
 %dir %{py_libdir}/asyncio
@@ -1205,6 +1146,7 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/multiprocessing/dummy/__pycache__
 %{py_libdir}/multiprocessing/dummy/*.py
 
+%{py_libdir}/pathlib
 %{py_libdir}/re
 %{py_libdir}/tomllib
 %{py_libdir}/turtledemo
@@ -1224,9 +1166,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_libdir}/venv/scripts/common
 %{py_libdir}/venv/scripts/common/Activate.ps1
 %{py_libdir}/venv/scripts/common/activate
+%{py_libdir}/venv/scripts/common/activate.fish
 %dir %{py_libdir}/venv/scripts/posix
 %{py_libdir}/venv/scripts/posix/activate.csh
-%{py_libdir}/venv/scripts/posix/activate.fish
 
 %dir %{py_libdir}/wsgiref
 %{py_libdir}/wsgiref/__pycache__
@@ -1325,21 +1267,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py_libdir}/timeit.py
 %{py_libdir}/__pycache__/timeit.cpython-*.py[co]
 
-%files 2to3
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/2to3-%{py_ver}
-%dir %{py_libdir}/lib2to3
-%{py_libdir}/lib2to3/__pycache__
-%{py_libdir}/lib2to3/*.txt
-%{py_libdir}/lib2to3/*.pickle
-%{py_libdir}/lib2to3/*.py
-%dir %{py_libdir}/lib2to3/fixes
-%{py_libdir}/lib2to3/fixes/__pycache__
-%{py_libdir}/lib2to3/fixes/*.py
-%dir %{py_libdir}/lib2to3/pgen2
-%{py_libdir}/lib2to3/pgen2/__pycache__
-%{py_libdir}/lib2to3/pgen2/*.py
-
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpython%{py_abi}.a
diff --git a/python3-BLDLIBRARY.patch b/python3-BLDLIBRARY.patch
index fcaecd9..81b054e 100644
--- a/python3-BLDLIBRARY.patch
+++ b/python3-BLDLIBRARY.patch
@@ -17,7 +17,7 @@
  
  platform: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt
  	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
-@@ -1056,7 +1056,7 @@ regen-re: $(BUILDPYTHON)
+@@ -1433,7 +1433,7 @@ regen-re: $(BUILDPYTHON)
  	$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/build/generate_re_casefix.py $(srcdir)/Lib/re/_casefix.py
  
  Programs/_testembed: Programs/_testembed.o $(LINK_PYTHON_DEPS)
@@ -25,7 +25,7 @@
 +	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBDIR) $(LINK_PYTHON_OBJS) $(LIBS) $(MODLIBS) $(SYSLIBS)
  
  ############################################################################
- # "Bootstrap Python" used to run deepfreeze.py
+ # "Bootstrap Python" used to run Programs/_freeze_module.py
 --- Python-3.8.5/configure.ac.orig	2020-09-17 07:55:13.735226834 +0200
 +++ Python-3.8.5/configure.ac	2020-09-17 10:46:44.172812084 +0200
 @@ -1359,6 +1359,7 @@ AC_MSG_RESULT([$LIBRARY])
@@ -44,40 +44,40 @@
  BLDLIBRARY='$(LDLIBRARY)'
  INSTSONAME='$(LDLIBRARY)'
  DLLLIBRARY=''
-@@ -1156,7 +1158,8 @@
-           ;;
+@@ -1548,7 +1548,8 @@ if test $enable_shared = "yes"; then
+       ;;
      SunOS*)
- 	  LDLIBRARY='libpython$(LDVERSION).so'
--	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
-+	  BLDLIBDIR='-Wl,-R,$(LIBDIR) -L.'
-+	  BLDLIBRARY='-lpython$(VERSION)'
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
- 	  if test "$with_pydebug" != yes
-@@ -1147,7 +1147,8 @@ if test $enable_shared = "yes"; then
-           ;;
+       LDLIBRARY='libpython$(LDVERSION).so'
+-      BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(LDVERSION)'
++      BLDLIBDIR='-Wl,-R,$(LIBDIR) -L.'
++      BLDLIBRARY='-lpython$(VERSION)'
+       RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+       INSTSONAME="$LDLIBRARY".$SOVERSION
+       if test "$with_pydebug" != yes
+@@ -1558,7 +1559,8 @@ if test $enable_shared = "yes"; then
+       ;;
      Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|VxWorks*)
- 	  LDLIBRARY='libpython$(LDVERSION).so'
--	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
-+	  BLDLIBDIR='-L.'
-+	  BLDLIBRARY='-lpython$(VERSION)'
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
- 	  if test "$with_pydebug" != yes
-@@ -1183,12 +1187,14 @@
- 			LDLIBRARY='libpython$(LDVERSION).sl'
- 			;;
- 	  esac
--	  BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
-+	  BLDLIBDIR='-Wl,+b,$(LIBDIR) -L.'
-+	  BLDLIBRARY='-lpython$(VERSION)'
- 	  RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
- 	  ;;
+       LDLIBRARY='libpython$(LDVERSION).so'
+-      BLDLIBRARY='-L. -lpython$(LDVERSION)'
++      BLDLIBDIR='-L.'
++      BLDLIBRARY='-lpython$(VERSION)'
+       RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+ 
+       # The Android Gradle plugin will only package libraries whose names end
+@@ -1581,12 +1583,14 @@ if test $enable_shared = "yes"; then
+           LDLIBRARY='libpython$(LDVERSION).sl'
+           ;;
+       esac
+-      BLDLIBRARY='-Wl,+b,$(LIBDIR) -L. -lpython$(LDVERSION)'
++      BLDLIBDIR='-Wl,+b,$(LIBDIR) -L.'
++      BLDLIBRARY='-lpython$(VERSION)'
+       RUNSHARED=SHLIB_PATH=`pwd`${SHLIB_PATH:+:${SHLIB_PATH}}
+       ;;
      Darwin*)
-     	LDLIBRARY='libpython$(LDVERSION).dylib'
--	BLDLIBRARY='-L. -lpython$(LDVERSION)'
-+	BLDLIBDIR='-L.'
-+	BLDLIBRARY='-lpython$(LDVERSION)'
- 	RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
- 	;;
-     AIX*)
+       LDLIBRARY='libpython$(LDVERSION).dylib'
+-      BLDLIBRARY='-L. -lpython$(LDVERSION)'
++      BLDLIBDIR='-L.'
++      BLDLIBRARY='-lpython$(LDVERSION)'
+       RUNSHARED=DYLD_LIBRARY_PATH=`pwd`${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+       ;;
+     iOS)
diff --git a/python3-installcompile.patch b/python3-installcompile.patch
index 1611ffb..a2f57bb 100644
--- a/python3-installcompile.patch
+++ b/python3-installcompile.patch
@@ -9,12 +9,13 @@
  
  # Install shared libraries enabled by Setup
  DESTDIRS=	$(exec_prefix) $(LIBDIR) $(BINLIBDEST) $(DESTSHARED)
-@@ -2316,6 +2316,8 @@ libinstall:	all $(srcdir)/Modules/xxmodu
- 	$(INSTALL_DATA) `cat pybuilddir.txt`/_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH).py \
- 		$(DESTDIR)$(LIBDEST); \
- 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
+@@ -2576,6 +2576,8 @@ libinstall:	all $(srcdir)/Modules/xxmodu
+ 		echo "Applying app store compliance patch"; \
+ 		patch --force --reject-file "$(abs_builddir)/app-store-compliance.rej" --strip 2 --directory "$(DESTDIR)$(LIBDEST)" --input "$(abs_srcdir)/$(APP_STORE_COMPLIANCE_PATCH)" || true ; \
+ 	fi
 +.PHONY: installcompile
 +installcompile: libainstall libinstall
  	@ # Build PYC files for the 3 optimization levels (0, 1, 2)
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+
diff --git a/python3-multilib.patch b/python3-multilib.patch
index 2421088..2d1bc21 100644
--- a/python3-multilib.patch
+++ b/python3-multilib.patch
@@ -3,58 +3,58 @@ diff -urNp -x '*.orig' Python-3.9.2.org/Lib/site.py Python-3.9.2/Lib/site.py
 +++ Python-3.9.2/Lib/site.py	2021-02-25 18:40:00.705652346 +0100
 @@ -295,7 +295,7 @@
      if sys.platform == 'darwin' and sys._framework:
-         return f'{userbase}/lib/python/site-packages'
+         return f'{userbase}/lib/{implementation_lower}/site-packages'
  
--    return f'{userbase}/lib/python{version[0]}.{version[1]}/site-packages'
-+    return f'{userbase}/{sys.platlibdir}/python{version[0]}.{version[1]}/site-packages'
+-    return f'{userbase}/lib/python{version[0]}.{version[1]}{abi_thread}/site-packages'
++    return f'{userbase}/{sys.platlibdir}/python{version[0]}.{version[1]}{abi_thread}/site-packages'
  
  
  def getuserbase():
-@@ -371,6 +371,8 @@ def getsitepackages(prefixes=None):
-                                     "python%d.%d" % sys.version_info[:2],
+@@ -408,6 +408,8 @@ def getsitepackages(prefixes=None):
+                                     f"{implementation}{ver[0]}.{ver[1]}{abi_thread}",
                                      "site-packages")
                  sitepackages.append(path)
-+            sitepackages.append(os.path.join(prefix, sys.platlibdir, "site-python"))
-+            sitepackages.append(os.path.join(prefix, "share", "python%d.%d" % sys.version_info[:2], "site-packages"))
++                sitepackages.append(os.path.join(prefix, sys.platlibdir, "site-python"))
++                sitepackages.append(os.path.join(prefix, "share", f"{implementation}{ver[0]}.{ver[1]}{abi_thread}", "site-packages"))
          else:
              sitepackages.append(prefix)
              sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
-diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig.py Python-3.9.2/Lib/sysconfig.py
---- Python-3.9.2.org/Lib/sysconfig.py	2021-02-19 13:31:44.000000000 +0100
-+++ Python-3.9.2/Lib/sysconfig.py	2021-02-25 18:40:00.705652346 +0100
-@@ -27,7 +27,7 @@
+diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig/__init__.py Python-3.9.2/Lib/sysconfig/__init__.py
+--- Python-3.9.2.org/Lib/sysconfig/__init__.py	2021-02-19 13:31:44.000000000 +0100
++++ Python-3.9.2/Lib/sysconfig/__init__.py	2021-02-25 18:40:00.705652346 +0100
+@@ -29,7 +29,7 @@ _INSTALL_SCHEMES = {
      'posix_prefix': {
-         'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}',
-         'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}',
--        'purelib': '{base}/lib/python{py_version_short}/site-packages',
-+        'purelib': '{base}/share/python{py_version_short}/site-packages',
-         'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
+         'stdlib': '{installed_base}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}',
+         'platstdlib': '{platbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}',
+-        'purelib': '{base}/lib/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
++        'purelib': '{base}/share/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
+         'platlib': '{platbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
          'include':
-             '{installed_base}/include/python{py_version_short}{abiflags}',
-@@ -37,10 +37,10 @@ _INSTALL_SCHEMES = {
+             '{installed_base}/include/{implementation_lower}{py_version_short}{abiflags}',
+@@ -39,10 +39,10 @@ _INSTALL_SCHEMES = {
          'data': '{base}',
          },
      'posix_home': {
--        'stdlib': '{installed_base}/lib/python',
--        'platstdlib': '{base}/lib/python',
--        'purelib': '{base}/lib/python',
--        'platlib': '{base}/lib/python',
-+        'stdlib': '{installed_base}/{platlibdir}/python',
-+        'platstdlib': '{base}/{platlibdir}/python',
-+        'purelib': '{base}/share/python',
-+        'platlib': '{base}/{platlibdir}/python',
-         'include': '{installed_base}/include/python',
-         'platinclude': '{installed_base}/include/python',
+-        'stdlib': '{installed_base}/lib/{implementation_lower}',
+-        'platstdlib': '{base}/lib/{implementation_lower}',
+-        'purelib': '{base}/lib/{implementation_lower}',
+-        'platlib': '{base}/lib/{implementation_lower}',
++        'stdlib': '{installed_base}/{platlibdir}/{implementation_lower}',
++        'platstdlib': '{base}/{platlibdir}/{implementation_lower}',
++        'purelib': '{base}/share/{implementation_lower}',
++        'platlib': '{base}/{platlibdir}/{implementation_lower}',
+         'include': '{installed_base}/include/{implementation_lower}',
+         'platinclude': '{installed_base}/include/{implementation_lower}',
          'scripts': '{base}/bin',
-@@ -100,8 +100,8 @@ if _HAS_USER_BASE:
+@@ -150,8 +150,8 @@ if _HAS_USER_BASE:
          'posix_user': {
-             'stdlib': '{userbase}/{platlibdir}/python{py_version_short}',
-             'platstdlib': '{userbase}/{platlibdir}/python{py_version_short}',
--            'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
--            'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+            'purelib': '{userbase}/share/python{py_version_short}/site-packages',
-+            'platlib': '{userbase}/{platlibdir}/python{py_version_short}/site-packages',
-             'include': '{userbase}/include/python{py_version_short}',
+             'stdlib': '{userbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}',
+             'platstdlib': '{userbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}',
+-            'purelib': '{userbase}/lib/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
+-            'platlib': '{userbase}/lib/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
++            'purelib': '{userbase}/share/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
++            'platlib': '{userbase}/{platlibdir}/{implementation_lower}{py_version_short}{abi_thread}/site-packages',
+             'include': '{userbase}/include/{implementation_lower}{py_version_short}{abi_thread}',
              'scripts': '{userbase}/bin',
              'data': '{userbase}',
 @@ -490,7 +490,11 @@ def get_config_h_filename():
@@ -86,7 +86,7 @@ diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig.py Python-3.9.2/Lib/syscon
  				echo Skip install of $(LIBRARY) - use make frameworkinstall; \
 --- Python-3.10.6/Lib/test/test_sysconfig.py.orig	2022-08-22 06:15:16.895139554 +0200
 +++ Python-3.10.6/Lib/test/test_sysconfig.py	2022-08-22 06:18:57.331178879 +0200
-@@ -299,13 +299,13 @@ class TestSysConfig(unittest.TestCase):
+@@ -414,13 +414,13 @@ class TestSysConfig(unittest.TestCase):
                  expected = os.path.normpath(global_path.replace(base, user, 1))
                  # bpo-44860: platlib of posix_user doesn't use sys.platlibdir,
                  # whereas posix_prefix does.
@@ -94,8 +94,8 @@ diff -urNp -x '*.orig' Python-3.9.2.org/Lib/sysconfig.py Python-3.9.2/Lib/syscon
 +                if name != 'platlib':
                      # Replace "/lib64/python3.11/site-packages" suffix
                      # with "/lib/python3.11/site-packages".
-                     py_version_short = sysconfig.get_python_version()
-                     suffix = f'python{py_version_short}/site-packages'
+                     py_version_abi = sysconfig._get_python_version_abi()
+                     suffix = f'python{py_version_abi}/site-packages'
 -                    expected = expected.replace(f'/{sys.platlibdir}/{suffix}',
 -                                                f'/lib/{suffix}')
 +                    expected = expected.replace(f'/lib/{suffix}',
diff --git a/python3-no-randomize-tests.patch b/python3-no-randomize-tests.patch
deleted file mode 100644
index a3f2c0e..0000000
--- a/python3-no-randomize-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Tools/scripts/run_tests.py~	2018-06-27 05:07:35.000000000 +0200
-+++ ./Tools/scripts/run_tests.py	2018-06-29 09:40:05.838625461 +0200
-@@ -31,7 +31,6 @@ def main(regrtest_args):
-     args.extend(test.support.args_from_interpreter_flags())
- 
-     args.extend(['-m', 'test',    # Run the test suite
--                 '-r',            # Randomize test order
-                  '-w',            # Re-run failed tests in verbose mode
-                  ])
-     if sys.platform == 'win32':
diff --git a/python3-pythonpath.patch b/python3-pythonpath.patch
deleted file mode 100644
index d2bd080..0000000
--- a/python3-pythonpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Python-3.0.1/Lib/cgi.py.wiget	2008-12-04 21:11:57.000000000 +0100
-+++ Python-3.0.1/Lib/cgi.py	2009-03-14 18:12:32.000000000 +0100
-@@ -1,6 +1,6 @@
--#! /usr/local/bin/python
-+#! /usr/bin/python3
- 
--# NOTE: the above "/usr/local/bin/python" is NOT a mistake.  It is
-+# NOTE: the above "/usr/bin/python3" is NOT a mistake.  It is
- # intentionally NOT "/usr/bin/env python".  On many systems
- # (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
- # scripts, and /usr/local/bin is the default directory where Python is
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3.git/commitdiff/02d39b3f1a50ccc938e616a52e64a481559e567c



More information about the pld-cvs-commit mailing list