From 1c8e9a60f480e5d360133a1ac042c723a0d34212 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Fri, 7 Oct 2016 19:22:17 +0200 Subject: [PATCH] Add the cryptography algorithms files to the respective file sections since the hashlib patch was dropped, so we are using currently python's implementation of these algorithms instead of the OpenSSL's ones. Relevant upstream issue26470. Remove the plat-linux directory and add the system configuration data files(upstream issue28046) --- python3.spec | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/python3.spec b/python3.spec index 2107279..2f7cec5 100644 --- a/python3.spec +++ b/python3.spec @@ -52,9 +52,10 @@ # For example, # foo/bar.py # now has bytecode at: -# foo/__pycache__/bar.cpython-35.pyc -# foo/__pycache__/bar.cpython-35.pyo -%global bytecode_suffixes .cpython-36*.py? +# foo/__pycache__/bar.cpython-36.pyc +# foo/__pycache__/bar.cpython-36.opt-1.pyc +# foo/__pycache__/bar.cpython-36.opt-2.pyc +%global bytecode_suffixes .cpython-36*.pyc # Python's configure script defines SOVERSION, and this is used in the Makefile # to determine INSTSONAME, the name of the libpython DSO: @@ -1207,10 +1208,16 @@ rm -fr %{buildroot} %dir %{pylibdir} %dir %{dynload_dir} +%{dynload_dir}/_blake2.%{SOABI_optimized}.so %{dynload_dir}/_md5.%{SOABI_optimized}.so -%{dynload_dir}/_sha256.%{SOABI_optimized}.so -%{dynload_dir}/_sha512.%{SOABI_optimized}.so %{dynload_dir}/_sha1.%{SOABI_optimized}.so +%{dynload_dir}/_sha256.%{SOABI_optimized}.so +%{dynload_dir}/_sha3.%{SOABI_optimized}.so +%{dynload_dir}/_sha512.%{SOABI_optimized}.so + +%{dynload_dir}/_sysconfigdata_%{ABIFLAGS_optimized}_linux_%{_arch}-linux%{_gnu}.py +%dir %{dynload_dir}/__pycache__/ +%{dynload_dir}/__pycache__/_sysconfigdata_%{ABIFLAGS_optimized}_linux_%{_arch}-linux%{_gnu}%{bytecode_suffixes} %{dynload_dir}/_bisect.%{SOABI_optimized}.so %{dynload_dir}/_bz2.%{SOABI_optimized}.so @@ -1274,6 +1281,7 @@ rm -fr %{buildroot} %dir %{pylibdir}/site-packages/ %dir %{pylibdir}/site-packages/__pycache__/ %{pylibdir}/site-packages/README +%{pylibdir}/site-packages/README.txt %{pylibdir}/*.py %dir %{pylibdir}/__pycache__/ %{pylibdir}/__pycache__/*%{bytecode_suffixes} @@ -1328,7 +1336,6 @@ rm -fr %{buildroot} %{pylibdir}/logging %{pylibdir}/multiprocessing -%{pylibdir}/plat-linux %dir %{pylibdir}/sqlite3/ %dir %{pylibdir}/sqlite3/__pycache__/ @@ -1435,10 +1442,15 @@ rm -fr %{buildroot} # 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}/_sha256.%{SOABI_debug}.so -%{dynload_dir}/_sha512.%{SOABI_debug}.so %{dynload_dir}/_sha1.%{SOABI_debug}.so +%{dynload_dir}/_sha256.%{SOABI_debug}.so +%{dynload_dir}/_sha3.%{SOABI_debug}.so +%{dynload_dir}/_sha512.%{SOABI_debug}.so + +%{dynload_dir}/_sysconfigdata_%{ABIFLAGS_debug}_linux_%{_arch}-linux%{_gnu}.py +%{dynload_dir}/__pycache__/_sysconfigdata_%{ABIFLAGS_debug}_linux_%{_arch}-linux%{_gnu}%{bytecode_suffixes} %{dynload_dir}/_bisect.%{SOABI_debug}.so %{dynload_dir}/_bz2.%{SOABI_debug}.so