rpms / python3.13

#10 Sanitize the %files section

Merged 2 years ago by churchyard. Opened 2 years ago by churchyard.

rpms/ churchyard/python3.13 files into rawhide

Remove a duplicate %files entry for /usr/lib64/libpython3.Xd.so.1.0

Miro Hrončok • 2 years ago

f7b1475

Sanitize the %files section

Miro Hrončok • 2 years ago

0412f51

python3.13.spec

file modified

+148 -304

		`@@ -1193,30 +1193,52 @@`

		`%license %{pylibdir}/LICENSE.txt`

		`- %dir %{pylibdir}/unittest/`
		`- %dir %{pylibdir}/unittest/__pycache__/`
		`- %{pylibdir}/unittest/*.py`
		`- %{pylibdir}/unittest/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/asyncio/`
		`- %dir %{pylibdir}/asyncio/__pycache__/`
		`- %{pylibdir}/asyncio/*.py`
		`- %{pylibdir}/asyncio/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/venv/`
		`- %dir %{pylibdir}/venv/__pycache__/`
		`- %{pylibdir}/venv/*.py`
		`- %{pylibdir}/venv/__pycache__/*%{bytecode_suffixes}`
		`- %{pylibdir}/venv/scripts`
		`+ # Pure Python modules`
		`+ %{pylibdir}/*.py`
		`+ %dir %{pylibdir}/__pycache__/`
		`+ %{pylibdir}/__pycache__/*%{bytecode_suffixes}`

		`- %{pylibdir}/wsgiref`
		`- %{pylibdir}/xmlrpc`
		`+ %{pylibdir}/__phello__/`
		`+ %{pylibdir}/asyncio/`
		`+ %{pylibdir}/collections/`
		`+ %{pylibdir}/concurrent/`
		`+ %{pylibdir}/ctypes/`
		`+ %{pylibdir}/curses/`
		`+ %{pylibdir}/dbm/`
		`+ %{pylibdir}/encodings/`
		`+ %{pylibdir}/html/`
		`+ %{pylibdir}/http/`
		`+ %{pylibdir}/importlib/`
		`+ %{pylibdir}/json/`
		`+ %{pylibdir}/logging/`
		`+ %{pylibdir}/multiprocessing/`
		`+ %{pylibdir}/pydoc_data/`
		`+ %{pylibdir}/re/`
		`+ %{pylibdir}/sqlite3/`
		`+ %{pylibdir}/sysconfig/`
		`+ %{pylibdir}/tomllib/`
		`+ %{pylibdir}/unittest/`
		`+ %{pylibdir}/urllib/`
		`+ %{pylibdir}/venv/`
		`+ %{pylibdir}/wsgiref/`
		`+ %{pylibdir}/xml/`
		`+ %{pylibdir}/xmlrpc/`
		`+ %{pylibdir}/zipfile/`
		`+ %{pylibdir}/zoneinfo/`
		`+`
		`+ # Handle the email module in detail to mark architecture.rst as %%doc`
		`+ %dir %{pylibdir}/email/`
		`+ %dir %{pylibdir}/email/__pycache__/`
		`+ %{pylibdir}/email/*.py`
		`+ %{pylibdir}/email/__pycache__/*%{bytecode_suffixes}`
		`+ %{pylibdir}/email/mime/`
		`+ %doc %{pylibdir}/email/architecture.rst`

		`+ # Handle the ensurepip module in detail to not accidentally ship wheels`
		`%dir %{pylibdir}/ensurepip/`
		`%dir %{pylibdir}/ensurepip/__pycache__/`
		`%{pylibdir}/ensurepip/*.py`
		`%{pylibdir}/ensurepip/__pycache__/*%{bytecode_suffixes}`
		`-`
		`%if %{with rpmwheels}`
		`%exclude %{pylibdir}/ensurepip/_bundled`
		`%else`
		`@@ -1224,190 +1246,94 @@`
		`%{pylibdir}/ensurepip/_bundled/pip-%{pip_version}-py3-none-any.whl`
		`%endif`

		`- %dir %{pylibdir}/concurrent/`
		`- %dir %{pylibdir}/concurrent/__pycache__/`
		`- %{pylibdir}/concurrent/*.py`
		`- %{pylibdir}/concurrent/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/concurrent/futures/`
		`- %dir %{pylibdir}/concurrent/futures/__pycache__/`
		`- %{pylibdir}/concurrent/futures/*.py`
		`- %{pylibdir}/concurrent/futures/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/sysconfig/`
		`- %dir %{pylibdir}/sysconfig/__pycache__/`
		`- %{pylibdir}/sysconfig/*.py`
		`- %{pylibdir}/sysconfig/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %{pylibdir}/pydoc_data`
		`-`
		`- %{dynload_dir}/_blake2.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_md5.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_sha1.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_sha2.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_sha3.%{SOABI_optimized}.so`
		`-`
		`- %{dynload_dir}/_asyncio.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_bisect.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_bz2.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_codecs_cn.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_codecs_hk.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_codecs_iso2022.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_codecs_jp.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_codecs_kr.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_codecs_tw.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_contextvars.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_csv.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_ctypes.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_curses.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_curses_panel.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_dbm.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_decimal.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_elementtree.%{SOABI_optimized}.so`
		`- %if %{with gdbm}`
		`- %{dynload_dir}/_gdbm.%{SOABI_optimized}.so`
		`- %endif`
		`- %{dynload_dir}/_hashlib.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_heapq.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_json.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_lsprof.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_lzma.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_multibytecodec.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_multiprocessing.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_opcode.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_pickle.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_posixsubprocess.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_queue.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_random.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_socket.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_sqlite3.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_ssl.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_statistics.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_struct.%{SOABI_optimized}.so`
		`- %{dynload_dir}/array.%{SOABI_optimized}.so`
		`- %{dynload_dir}/binascii.%{SOABI_optimized}.so`
		`- %{dynload_dir}/cmath.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_datetime.%{SOABI_optimized}.so`
		`- %{dynload_dir}/fcntl.%{SOABI_optimized}.so`
		`- %{dynload_dir}/grp.%{SOABI_optimized}.so`
		`- %{dynload_dir}/math.%{SOABI_optimized}.so`
		`- %{dynload_dir}/mmap.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_posixshmem.%{SOABI_optimized}.so`
		`- %{dynload_dir}/pyexpat.%{SOABI_optimized}.so`
		`- %{dynload_dir}/readline.%{SOABI_optimized}.so`
		`- %{dynload_dir}/resource.%{SOABI_optimized}.so`
		`- %{dynload_dir}/select.%{SOABI_optimized}.so`
		`- %{dynload_dir}/syslog.%{SOABI_optimized}.so`
		`- %{dynload_dir}/termios.%{SOABI_optimized}.so`
		`- %{dynload_dir}/unicodedata.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_uuid.%{SOABI_optimized}.so`
		`- %{dynload_dir}/xxlimited.%{SOABI_optimized}.so`
		`- %{dynload_dir}/xxlimited_35.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_xxsubinterpreters.%{SOABI_optimized}.so`
		`- %{dynload_dir}/xxsubtype.%{SOABI_optimized}.so`
		`- %{dynload_dir}/zlib.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_zoneinfo.%{SOABI_optimized}.so`
		`-`
		`- %dir %{pylibdir}/site-packages/`
		`- %dir %{pylibdir}/site-packages/__pycache__/`
		`- %{pylibdir}/site-packages/README.txt`
		`+ # This will be in the tkinter package`
		`+ %exclude %{pylibdir}/turtle.py`
		`+ %exclude %{pylibdir}/__pycache__/turtle*%{bytecode_suffixes}`

		`+ # This will be in the debug package`
		`%if %{with debug_build}`
		`%exclude %{pylibdir}/_sysconfigdata_%{ABIFLAGS_debug}_linux_%{platform_triplet}.py`
		`%exclude %{pylibdir}/__pycache__/_sysconfigdata_%{ABIFLAGS_debug}_linux_%{platform_triplet}%{bytecode_suffixes}`
		`%endif`

		`- %{pylibdir}/*.py`
		`- %dir %{pylibdir}/__pycache__/`
		`- %{pylibdir}/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/collections/`
		`- %dir %{pylibdir}/collections/__pycache__/`
		`- %{pylibdir}/collections/*.py`
		`- %{pylibdir}/collections/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/ctypes/`
		`- %dir %{pylibdir}/ctypes/__pycache__/`
		`- %{pylibdir}/ctypes/*.py`
		`- %{pylibdir}/ctypes/__pycache__/*%{bytecode_suffixes}`
		`- %{pylibdir}/ctypes/macholib`
		`+ # Extension modules`
		`+ # This is macronized for reuse in the -debug package`
		`+ %define extension_modules() \`
		`+ %{dynload_dir}/_asyncio.%{1}.so\`
		`+ %{dynload_dir}/_bisect.%{1}.so\`
		`+ %{dynload_dir}/_blake2.%{1}.so\`
		`+ %{dynload_dir}/_bz2.%{1}.so\`
		`+ %{dynload_dir}/_codecs_cn.%{1}.so\`
		`+ %{dynload_dir}/_codecs_hk.%{1}.so\`
		`+ %{dynload_dir}/_codecs_iso2022.%{1}.so\`
		`+ %{dynload_dir}/_codecs_jp.%{1}.so\`
		`+ %{dynload_dir}/_codecs_kr.%{1}.so\`
		`+ %{dynload_dir}/_codecs_tw.%{1}.so\`
		`+ %{dynload_dir}/_contextvars.%{1}.so\`
		`+ %{dynload_dir}/_csv.%{1}.so\`
		`+ %{dynload_dir}/_ctypes.%{1}.so\`
		`+ %{dynload_dir}/_curses.%{1}.so\`
		`+ %{dynload_dir}/_curses_panel.%{1}.so\`
		`+ %{dynload_dir}/_datetime.%{1}.so\`
		`+ %{dynload_dir}/_dbm.%{1}.so\`
		`+ %if %{with gdbm}\`
		`+ %{dynload_dir}/_gdbm.%{1}.so\`
		`+ %endif\`
		`+ %{dynload_dir}/_decimal.%{1}.so\`
		`+ %{dynload_dir}/_elementtree.%{1}.so\`
		`+ %{dynload_dir}/_hashlib.%{1}.so\`
		`+ %{dynload_dir}/_heapq.%{1}.so\`
		`+ %{dynload_dir}/_json.%{1}.so\`
		`+ %{dynload_dir}/_lsprof.%{1}.so\`
		`+ %{dynload_dir}/_lzma.%{1}.so\`
		`+ %{dynload_dir}/_md5.%{1}.so\`
		`+ %{dynload_dir}/_multibytecodec.%{1}.so\`
		`+ %{dynload_dir}/_multiprocessing.%{1}.so\`
		`+ %{dynload_dir}/_opcode.%{1}.so\`
		`+ %{dynload_dir}/_pickle.%{1}.so\`
		`+ %{dynload_dir}/_posixshmem.%{1}.so\`
		`+ %{dynload_dir}/_posixsubprocess.%{1}.so\`
		`+ %{dynload_dir}/_queue.%{1}.so\`
		`+ %{dynload_dir}/_random.%{1}.so\`
		`+ %{dynload_dir}/_sha1.%{1}.so\`
		`+ %{dynload_dir}/_sha2.%{1}.so\`
		`+ %{dynload_dir}/_sha3.%{1}.so\`
		`+ %{dynload_dir}/_socket.%{1}.so\`
		`+ %{dynload_dir}/_sqlite3.%{1}.so\`
		`+ %{dynload_dir}/_ssl.%{1}.so\`
		`+ %{dynload_dir}/_statistics.%{1}.so\`
		`+ %{dynload_dir}/_struct.%{1}.so\`
		`+ %{dynload_dir}/_uuid.%{1}.so\`
		`+ %{dynload_dir}/_xxsubinterpreters.%{1}.so\`
		`+ %{dynload_dir}/_zoneinfo.%{1}.so\`
		`+ %{dynload_dir}/array.%{1}.so\`
		`+ %{dynload_dir}/binascii.%{1}.so\`
		`+ %{dynload_dir}/cmath.%{1}.so\`
		`+ %{dynload_dir}/fcntl.%{1}.so\`
		`+ %{dynload_dir}/grp.%{1}.so\`
		`+ %{dynload_dir}/math.%{1}.so\`
		`+ %{dynload_dir}/mmap.%{1}.so\`
		`+ %{dynload_dir}/pyexpat.%{1}.so\`
		`+ %{dynload_dir}/readline.%{1}.so\`
		`+ %{dynload_dir}/resource.%{1}.so\`
		`+ %{dynload_dir}/select.%{1}.so\`
		`+ %{dynload_dir}/syslog.%{1}.so\`
		`+ %{dynload_dir}/termios.%{1}.so\`
		`+ %{dynload_dir}/unicodedata.%{1}.so\`
		`+ %{dynload_dir}/xxlimited.%{1}.so\`
		`+ %{dynload_dir}/xxlimited_35.%{1}.so\`
		`+ %{dynload_dir}/xxsubtype.%{1}.so\`
		`+ %{dynload_dir}/zlib.%{1}.so`
		`+`
		`+ %extension_modules %{SOABI_optimized}`

		`- %{pylibdir}/curses`
		`-`
		`- %dir %{pylibdir}/dbm/`
		`- %dir %{pylibdir}/dbm/__pycache__/`
		`- %{pylibdir}/dbm/*.py`
		`- %{pylibdir}/dbm/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/email/`
		`- %dir %{pylibdir}/email/__pycache__/`
		`- %{pylibdir}/email/*.py`
		`- %{pylibdir}/email/__pycache__/*%{bytecode_suffixes}`
		`- %{pylibdir}/email/mime`
		`- %doc %{pylibdir}/email/architecture.rst`
		`-`
		`- %{pylibdir}/encodings`
		`-`
		`- %{pylibdir}/html`
		`- %{pylibdir}/http`
		`-`
		`- %dir %{pylibdir}/importlib/`
		`- %dir %{pylibdir}/importlib/__pycache__/`
		`- %{pylibdir}/importlib/*.py`
		`- %{pylibdir}/importlib/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/importlib/metadata/`
		`- %dir %{pylibdir}/importlib/metadata/__pycache__/`
		`- %{pylibdir}/importlib/metadata/*.py`
		`- %{pylibdir}/importlib/metadata/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/importlib/resources/`
		`- %dir %{pylibdir}/importlib/resources/__pycache__/`
		`- %{pylibdir}/importlib/resources/*.py`
		`- %{pylibdir}/importlib/resources/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/json/`
		`- %dir %{pylibdir}/json/__pycache__/`
		`- %{pylibdir}/json/*.py`
		`- %{pylibdir}/json/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %{pylibdir}/logging`
		`- %{pylibdir}/multiprocessing`
		`-`
		`- %dir %{pylibdir}/re/`
		`- %{pylibdir}/re/*.py`
		`- %{pylibdir}/re/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/sqlite3/`
		`- %dir %{pylibdir}/sqlite3/__pycache__/`
		`- %{pylibdir}/sqlite3/*.py`
		`- %{pylibdir}/sqlite3/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %dir %{pylibdir}/tomllib/`
		`- %{pylibdir}/tomllib/*.py`
		`- %{pylibdir}/tomllib/__pycache__/*%{bytecode_suffixes}`
		`- %exclude %{pylibdir}/turtle.py`
		`- %exclude %{pylibdir}/__pycache__/turtle*%{bytecode_suffixes}`
		`-`
		`- %{pylibdir}/urllib`
		`- %{pylibdir}/xml`
		`-`
		`- %dir %{pylibdir}/zipfile/`
		`- %{pylibdir}/zipfile/*.py`
		`- %{pylibdir}/zipfile/__pycache__/*%{bytecode_suffixes}`
		`- %{pylibdir}/zipfile/_path/*.py`
		`- %{pylibdir}/zipfile/_path/__pycache__/*%{bytecode_suffixes}`
		`-`
		`- %{pylibdir}/zoneinfo`
		`-`
		`- %dir %{pylibdir}/__phello__`
		`- %{pylibdir}/__phello__/__init__.py`
		`- %{pylibdir}/__phello__/spam.py`
		`- %{pylibdir}/__phello__/__pycache__/*%{bytecode_suffixes}`
		`+ %dir %{pylibdir}/site-packages/`
		`+ %dir %{pylibdir}/site-packages/__pycache__/`
		`+ %{pylibdir}/site-packages/README.txt`

		`%if "%{_lib}" == "lib64"`
		`- %attr(0755,root,root) %dir %{_prefix}/lib/python%{pybasever}`
		`- %attr(0755,root,root) %dir %{_prefix}/lib/python%{pybasever}/site-packages`
		`+ %attr(0755,root,root) %dir %{_prefix}/lib/python%{pybasever}/`
		`+ %attr(0755,root,root) %dir %{_prefix}/lib/python%{pybasever}/site-packages/`
		`%attr(0755,root,root) %dir %{_prefix}/lib/python%{pybasever}/site-packages/__pycache__/`
		`%endif`

		`@@ -1419,6 +1345,7 @@`
		`%dir %{_includedir}/python%{LDVERSION_optimized}/`
		`%{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}`

		`+ # Finally, libpython`
		`%{_libdir}/%{py_INSTSONAME_optimized}`
		`%if %{with main_python}`
		`%{_libdir}/libpython3.so`
		`@@ -1487,25 +1414,31 @@`


		`%files -n %{pkgname}-test`
		`- %{pylibdir}/test`
		`- %{dynload_dir}/_ctypes_test.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_testbuffer.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_testcapi.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_testclinic.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_testclinic_limited.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_testimportmultiple.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_testinternalcapi.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_testmultiphase.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_testsinglephase.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_xxinterpchannels.%{SOABI_optimized}.so`
		`- %{dynload_dir}/_xxtestfuzz.%{SOABI_optimized}.so`
		`+ %{pylibdir}/test/`
		`+`
		`+ # Extension modules`
		`+ # This is macronized for reuse in the -debug package`
		`+ %define extension_modules_test() \`
		`+ %{dynload_dir}/_ctypes_test.%{1}.so\`
		`+ %{dynload_dir}/_testbuffer.%{1}.so\`
		`+ %{dynload_dir}/_testcapi.%{1}.so\`
		`+ %{dynload_dir}/_testclinic.%{1}.so\`
		`+ %{dynload_dir}/_testclinic_limited.%{1}.so\`
		`+ %{dynload_dir}/_testimportmultiple.%{1}.so\`
		`+ %{dynload_dir}/_testinternalcapi.%{1}.so\`
		`+ %{dynload_dir}/_testmultiphase.%{1}.so\`
		`+ %{dynload_dir}/_testsinglephase.%{1}.so\`
		`+ %{dynload_dir}/_xxinterpchannels.%{1}.so\`
		`+ %{dynload_dir}/_xxtestfuzz.%{1}.so`
		`+`
		`+ %extension_modules_test %{SOABI_optimized}`
		`+`

		`# We don't bother splitting the debug build out into further subpackages:`
		`- # if you need it, you're probably a developer.`
		`+ # if you need it, you're debugging and you probably don't mind having it all.`

		`# Hence the manifest is the combination of analogous files in the manifests of`
		`# all of the other subpackages`
		`-`
		`%if %{with debug_build}`
		`%files -n %{pkgname}-debug`
		`%if %{with main_python}`
		`@@ -1516,112 +1449,23 @@`
		`# Analog of the core subpackage's files:`
		`%{_bindir}/python%{LDVERSION_debug}`

		`- # Analog of the -libs subpackage's files:`
		`- # ...with debug builds of the built-in "extension" modules:`
		`-`
		`- %{dynload_dir}/_blake2.%{SOABI_debug}.so`
		`- %{dynload_dir}/_md5.%{SOABI_debug}.so`
		`- %{dynload_dir}/_sha1.%{SOABI_debug}.so`
		`- %{dynload_dir}/_sha2.%{SOABI_debug}.so`
		`- %{dynload_dir}/_sha3.%{SOABI_debug}.so`
		`-`
		`- %{dynload_dir}/_asyncio.%{SOABI_debug}.so`
		`- %{dynload_dir}/_bisect.%{SOABI_debug}.so`
		`- %{dynload_dir}/_bz2.%{SOABI_debug}.so`
		`- %{dynload_dir}/_codecs_cn.%{SOABI_debug}.so`
		`- %{dynload_dir}/_codecs_hk.%{SOABI_debug}.so`
		`- %{dynload_dir}/_codecs_iso2022.%{SOABI_debug}.so`
		`- %{dynload_dir}/_codecs_jp.%{SOABI_debug}.so`
		`- %{dynload_dir}/_codecs_kr.%{SOABI_debug}.so`
		`- %{dynload_dir}/_codecs_tw.%{SOABI_debug}.so`
		`- %{dynload_dir}/_contextvars.%{SOABI_debug}.so`
		`- %{dynload_dir}/_csv.%{SOABI_debug}.so`
		`- %{dynload_dir}/_ctypes.%{SOABI_debug}.so`
		`- %{dynload_dir}/_curses.%{SOABI_debug}.so`
		`- %{dynload_dir}/_curses_panel.%{SOABI_debug}.so`
		`- %{dynload_dir}/_dbm.%{SOABI_debug}.so`
		`- %{dynload_dir}/_decimal.%{SOABI_debug}.so`
		`- %{dynload_dir}/_elementtree.%{SOABI_debug}.so`
		`- %if %{with gdbm}`
		`- %{dynload_dir}/_gdbm.%{SOABI_debug}.so`
		`- %endif`
		`- %{dynload_dir}/_hashlib.%{SOABI_debug}.so`
		`- %{dynload_dir}/_heapq.%{SOABI_debug}.so`
		`- %{dynload_dir}/_json.%{SOABI_debug}.so`
		`- %{dynload_dir}/_lsprof.%{SOABI_debug}.so`
		`- %{dynload_dir}/_lzma.%{SOABI_debug}.so`
		`- %{dynload_dir}/_multibytecodec.%{SOABI_debug}.so`
		`- %{dynload_dir}/_multiprocessing.%{SOABI_debug}.so`
		`- %{dynload_dir}/_opcode.%{SOABI_debug}.so`
		`- %{dynload_dir}/_pickle.%{SOABI_debug}.so`
		`- %{dynload_dir}/_posixsubprocess.%{SOABI_debug}.so`
		`- %{dynload_dir}/_queue.%{SOABI_debug}.so`
		`- %{dynload_dir}/_random.%{SOABI_debug}.so`
		`- %{dynload_dir}/_socket.%{SOABI_debug}.so`
		`- %{dynload_dir}/_sqlite3.%{SOABI_debug}.so`
		`- %{dynload_dir}/_ssl.%{SOABI_debug}.so`
		`- %{dynload_dir}/_statistics.%{SOABI_debug}.so`
		`- %{dynload_dir}/_struct.%{SOABI_debug}.so`
		`- %{dynload_dir}/array.%{SOABI_debug}.so`
		`- %{dynload_dir}/binascii.%{SOABI_debug}.so`
		`- %{dynload_dir}/cmath.%{SOABI_debug}.so`
		`- %{dynload_dir}/_datetime.%{SOABI_debug}.so`
		`- %{dynload_dir}/fcntl.%{SOABI_debug}.so`
		`- %{dynload_dir}/grp.%{SOABI_debug}.so`
		`- %{dynload_dir}/math.%{SOABI_debug}.so`
		`- %{dynload_dir}/mmap.%{SOABI_debug}.so`
		`- %{dynload_dir}/_posixshmem.%{SOABI_debug}.so`
		`- %{dynload_dir}/pyexpat.%{SOABI_debug}.so`
		`- %{dynload_dir}/readline.%{SOABI_debug}.so`
		`- %{dynload_dir}/resource.%{SOABI_debug}.so`
		`- %{dynload_dir}/select.%{SOABI_debug}.so`
		`- %{dynload_dir}/syslog.%{SOABI_debug}.so`
		`- %{dynload_dir}/termios.%{SOABI_debug}.so`
		`- %{dynload_dir}/unicodedata.%{SOABI_debug}.so`
		`- %{dynload_dir}/_uuid.%{SOABI_debug}.so`
		`- %{dynload_dir}/xxlimited.%{SOABI_debug}.so`
		`- %{dynload_dir}/xxlimited_35.%{SOABI_debug}.so`
		`- %{dynload_dir}/_xxsubinterpreters.%{SOABI_debug}.so`
		`- %{dynload_dir}/xxsubtype.%{SOABI_debug}.so`
		`- %{dynload_dir}/zlib.%{SOABI_debug}.so`
		`- %{dynload_dir}/_zoneinfo.%{SOABI_debug}.so`
		`-`
		`- # No need to split things out the "Makefile" and the config-32/64.h file as we`
		`- # do for the regular build above (bug 531901), since they're all in one package`
		`- # now; they're listed below, under "-devel":`
		`-`
		`+ # Analog to the -libs subpackage's files:`
		`%{_libdir}/%{py_INSTSONAME_debug}`

		`+ # Analog of the libs, test, and tkinter extension modules:`
		`+ %extension_modules %{SOABI_debug}`
		`+ %extension_modules_test %{SOABI_debug}`
		`+ %{dynload_dir}/_tkinter.%{SOABI_debug}.so`
		`+`
		`# Analog of the -devel subpackage's files:`
		`- %{pylibdir}/config-%{LDVERSION_debug}-%{platform_triplet}`
		`- %{_includedir}/python%{LDVERSION_debug}`
		`+ %{pylibdir}/config-%{LDVERSION_debug}-%{platform_triplet}/`
		`+ %{_includedir}/python%{LDVERSION_debug}/`
		`%{_bindir}/python%{LDVERSION_debug}-config`
		`%{_bindir}/python%{LDVERSION_debug}-*-config`
		`%{_libdir}/libpython%{LDVERSION_debug}.so`
		`- %{_libdir}/libpython%{LDVERSION_debug}.so.%{py_SOVERSION}`
		`%{_libdir}/pkgconfig/python-%{LDVERSION_debug}.pc`
		`%{_libdir}/pkgconfig/python-%{LDVERSION_debug}-embed.pc`

		`- # Analog of the -tools subpackage's files:`
		`- # None for now; we could build precanned versions that have the appropriate`
		`- # shebang if needed`
		`-`
		`- # Analog of the tkinter subpackage's files:`
		`- %{dynload_dir}/_tkinter.%{SOABI_debug}.so`
		`-`
		`- # Analog of the -test subpackage's files:`
		`- %{dynload_dir}/_ctypes_test.%{SOABI_debug}.so`
		`- %{dynload_dir}/_testbuffer.%{SOABI_debug}.so`
		`- %{dynload_dir}/_testcapi.%{SOABI_debug}.so`
		`- %{dynload_dir}/_testclinic.%{SOABI_debug}.so`
		`- %{dynload_dir}/_testclinic_limited.%{SOABI_debug}.so`
		`- %{dynload_dir}/_testimportmultiple.%{SOABI_debug}.so`
		`- %{dynload_dir}/_testinternalcapi.%{SOABI_debug}.so`
		`- %{dynload_dir}/_testmultiphase.%{SOABI_debug}.so`
		`- %{dynload_dir}/_testsinglephase.%{SOABI_debug}.so`
		`- %{dynload_dir}/_xxinterpchannels.%{SOABI_debug}.so`
		`- %{dynload_dir}/_xxtestfuzz.%{SOABI_debug}.so`
		`-`
		`%{pylibdir}/_sysconfigdata_%{ABIFLAGS_debug}_linux_%{platform_triplet}.py`
		`%{pylibdir}/__pycache__/_sysconfigdata_%{ABIFLAGS_debug}_linux_%{platform_triplet}%{bytecode_suffixes}`

churchyard commented 2 years ago

Don't bother listing %dirs and pycache and *.py, list entire directories
Keep pure Python and exctension modules separated
Sort things
Macronize the list of extension modules for -debug
Remove some duplicates

zuul commented 2 years ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/32739056cf6c4e3c9061ab70a1bd636d

check-for-arches : SUCCESS in 1m 50s
check-for-eln : SUCCESS in 19s
rpm-scratch-build : SUCCESS in 1h 01m 40s
rpm-scratch-build-s390x : SUCCESS in 1h 11m 50s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 1h 06m 55s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 1h 13m 06s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 57m 02s (non-voting)
rpm-linter : SUCCESS in 8m 19s (non-voting)
rpm-rpminspect : SUCCESS in 17m 06s (non-voting)
check-for-sti-tests : SUCCESS in 17s
check-for-fmf-tests : SUCCESS in 18s
rpm-install-test : SUCCESS in 2m 20s
rpm-sti-test : SUCCESS in 30m 41s
Skipped 2 jobs

rebased onto df0425e6a8d563deef16579c1126cabc297aede3

2 years ago

zuul commented 2 years ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/40ce286d5f1945ebb776c3fac6a55635

check-for-arches : SUCCESS in 2m 46s
check-for-eln : SUCCESS in 18s
rpm-scratch-build : SUCCESS in 55m 44s
rpm-scratch-build-s390x : SUCCESS in 58m 03s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 1h 01m 43s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 57m 20s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 42m 02s (non-voting)
rpm-linter : SUCCESS in 6m 13s (non-voting)
rpm-rpminspect : SUCCESS in 16m 49s (non-voting)
check-for-sti-tests : SUCCESS in 19s
check-for-fmf-tests : SUCCESS in 16s
rpm-install-test : SUCCESS in 1m 48s
rpm-sti-test : SUCCESS in 29m 53s
Skipped 2 jobs

ksurma commented on line 55 of python3.13.spec 2 years ago

Suggestion: # Handle the email module in detail to mark architecture.rst as %%doc

The meaning has become clear to me when I read the sentence about ensurepip below, but as a unique comment not really, hence suggestion.

ksurma commented on line 387 of python3.13.spec 2 years ago

It's unrelated but I can't help myself. What's the meaning of this explanation? "You're developer, so you need it all"? Or "You're developer, you'll hack your way through this"? I can understand the first part, but the second doesn't really ring a bell.

Edited 2 years ago by ksurma

ksurma commented on line 473 of python3.13.spec 2 years ago

This line disappeared from the specfile and doesn't reappear. Is that correct?

ksurma commented 2 years ago

Keep pure Python and exctension modules separated

Typo in the commit msg: exctension -> extension

rebased onto 4592c33dc35b35172fae559e99730b41babe47c5

2 years ago

churchyard commented 2 years ago

I amended the commit message to fix a typo and remove "Remove some duplicates", with no diff changes.
I added a fixup commit with all your other comments addressed.
I added another commit with explanation of the removed line (and while doing it, actually removed the other line).

ksurma commented 2 years ago

Thank you, the diff looks alright to me.

I see one more typo in the newly added commit:
This files is ... -> This file is ...

churchyard commented 2 years ago

Squashed the fixup and amended the typo in the second commit.

rebased onto 013d4dab1733b77fd01628746e7a0856bc402bcf

2 years ago

rebased onto 0412f51

2 years ago

churchyard commented 2 years ago

I'm gonna wait for the CI build and diff the actual list of packaged files.

zuul commented 2 years ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/989508e08e1a4fb6b6ef80d279e85e29

check-for-arches : SUCCESS in 2m 05s
check-for-eln : SUCCESS in 20s
rpm-scratch-build : SUCCESS in 54m 04s
rpm-scratch-build-s390x : SUCCESS in 1h 05m 57s (non-voting)
rpm-scratch-build-ppc64le : SUCCESS in 57m 26s (non-voting)
rpm-scratch-build-i686 : SUCCESS in 1h 02m 02s (non-voting)
rpm-scratch-build-aarch64 : SUCCESS in 44m 41s (non-voting)
rpm-linter : SUCCESS in 6m 24s (non-voting)
rpm-rpminspect : SUCCESS in 13m 54s (non-voting)
check-for-sti-tests : SUCCESS in 18s
check-for-fmf-tests : SUCCESS in 16s
rpm-install-test : SUCCESS in 2m 15s
rpm-sti-test : SUCCESS in 29m 00s
Skipped 2 jobs

churchyard commented 2 years ago

I obtained the builds:

[scratch]$ koji download-task --arch=x86_64 --arch=noarch 109701527
[actual]$ koji download-build --arch=x86_64 --arch=noarch python3.13-3.13.0~a2-1.fc40

And I diffed the filelists without build-ids:

[actual]$ for pkg in $(ls); do echo $pkg; echo ========; echo '```'; diff -u <(rpm -qlp $pkg | grep -v  /usr/lib/.build-id | sort) <(rpm -qlp ../scratch/$pkg | grep -v  /usr/lib/.build-id | sort); echo '```'; echo; echo; done

The only package with differences was:

python3.13-libs-3.13.0~a2-1.fc40.x86_64.rpm

--- /dev/fd/63  2023-11-29 19:54:49.233715447 +0100
+++ /dev/fd/62  2023-11-29 19:54:49.234715453 +0100
@@ -1095,6 +1095,7 @@
 /usr/lib64/python3.13/pdb.py
 /usr/lib64/python3.13/__phello__
 /usr/lib64/python3.13/__phello__/__init__.py
+/usr/lib64/python3.13/__phello__/__pycache__
 /usr/lib64/python3.13/__phello__/__pycache__/__init__.cpython-313.opt-1.pyc
 /usr/lib64/python3.13/__phello__/__pycache__/__init__.cpython-313.opt-2.pyc
 /usr/lib64/python3.13/__phello__/__pycache__/__init__.cpython-313.pyc
@@ -1587,6 +1588,7 @@
 /usr/lib64/python3.13/re/__init__.py
 /usr/lib64/python3.13/re/_parser.py
 /usr/lib64/python3.13/reprlib.py
+/usr/lib64/python3.13/re/__pycache__
 /usr/lib64/python3.13/re/__pycache__/_casefix.cpython-313.opt-1.pyc
 /usr/lib64/python3.13/re/__pycache__/_casefix.cpython-313.opt-2.pyc
 /usr/lib64/python3.13/re/__pycache__/_casefix.cpython-313.pyc
@@ -1673,6 +1675,7 @@
 /usr/lib64/python3.13/tomllib
 /usr/lib64/python3.13/tomllib/__init__.py
 /usr/lib64/python3.13/tomllib/_parser.py
+/usr/lib64/python3.13/tomllib/__pycache__
 /usr/lib64/python3.13/tomllib/__pycache__/__init__.cpython-313.opt-1.pyc
 /usr/lib64/python3.13/tomllib/__pycache__/__init__.cpython-313.opt-2.pyc
 /usr/lib64/python3.13/tomllib/__pycache__/__init__.cpython-313.pyc
@@ -1942,14 +1945,17 @@
 /usr/lib64/python3.13/zipfile
 /usr/lib64/python3.13/zipfile/__init__.py
 /usr/lib64/python3.13/zipfile/__main__.py
+/usr/lib64/python3.13/zipfile/_path
 /usr/lib64/python3.13/zipfile/_path/glob.py
 /usr/lib64/python3.13/zipfile/_path/__init__.py
+/usr/lib64/python3.13/zipfile/_path/__pycache__
 /usr/lib64/python3.13/zipfile/_path/__pycache__/glob.cpython-313.opt-1.pyc
 /usr/lib64/python3.13/zipfile/_path/__pycache__/glob.cpython-313.opt-2.pyc
 /usr/lib64/python3.13/zipfile/_path/__pycache__/glob.cpython-313.pyc
 /usr/lib64/python3.13/zipfile/_path/__pycache__/__init__.cpython-313.opt-1.pyc
 /usr/lib64/python3.13/zipfile/_path/__pycache__/__init__.cpython-313.opt-2.pyc
 /usr/lib64/python3.13/zipfile/_path/__pycache__/__init__.cpython-313.pyc
+/usr/lib64/python3.13/zipfile/__pycache__
 /usr/lib64/python3.13/zipfile/__pycache__/__init__.cpython-313.opt-1.pyc
 /usr/lib64/python3.13/zipfile/__pycache__/__init__.cpython-313.opt-2.pyc
 /usr/lib64/python3.13/zipfile/__pycache__/__init__.cpython-313.pyc

And indeed, on my machine (with the actual build, but for f37):

$ LANG=C rpm -qf /usr/lib64/python3.13/__phello__/__pycache__ /usr/lib64/python3.13/re/__pycache__ /usr/lib64/python3.13/tomllib/__pycache__ /usr/lib64/python3.13/zipfile/_path /usr/lib64/python3.13/zipfile/_path/__pycache__ /usr/lib64/python3.13/zipfile/__pycache__
file /usr/lib64/python3.13/__phello__/__pycache__ is not owned by any package
file /usr/lib64/python3.13/re/__pycache__ is not owned by any package
file /usr/lib64/python3.13/tomllib/__pycache__ is not owned by any package
file /usr/lib64/python3.13/zipfile/_path is not owned by any package
file /usr/lib64/python3.13/zipfile/_path/__pycache__ is not owned by any package
file /usr/lib64/python3.13/zipfile/__pycache__ is not owned by any package

And:

$ sudo dnf remove python3.13-libs
...
$ tree /usr/lib64/python3.13/
/usr/lib64/python3.13/
├── __phello__
│   └── __pycache__
├── re
│   └── __pycache__
├── tomllib
│   └── __pycache__
└── zipfile
    ├── _path
    │   └── __pycache__
    └── __pycache__

11 directories, 0 files

Bah! Our extra careful hand-managed filelist was tedious to maintain and it hid bugs!

churchyard commented 2 years ago

As far as I can tell, the issue goes back to 3.11:

$ tree /usr/lib64/python3.1*
/usr/lib64/python3.11
├── __phello__
│   └── __pycache__
├── re
│   └── __pycache__
└── tomllib
    └── __pycache__
/usr/lib64/python3.12
├── __phello__
│   └── __pycache__
├── re
│   └── __pycache__
├── tomllib
│   └── __pycache__
└── zipfile
    ├── __pycache__
    └── _path
        └── __pycache__
/usr/lib64/python3.13
├── __phello__
│   └── __pycache__
├── re
│   └── __pycache__
├── tomllib
│   └── __pycache__
└── zipfile
    ├── __pycache__
    └── _path
        └── __pycache__

29 directories, 0 files

This means we either backport this there or manually fix it.

churchyard commented 2 years ago

I've opened:

https://bugzilla.redhat.com/show_bug.cgi?id=2252143
https://bugzilla.redhat.com/show_bug.cgi?id=2252144

Pull-Request has been merged by churchyard

2 years ago

zuul commented 2 years ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/01e652cee1224455b73c2390d1e4f5c9