Accepting request 821366 from home:gmbr3:Active

- Spec file fixes
- Re-added subprocess-raise-timeout.patch: now compatible
- Removed bpo34022-stop_hash-based_invalidation_w_SOURCE_DATE_EPOCH.patch: contained in upstream

OBS-URL: https://build.opensuse.org/request/show/821366
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=10

python39.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package python38
+# spec file for package python39
 #
 # Copyright (c) 2020 SUSE LLC
 #
@@ -49,7 +49,7 @@
 %else
 %define tarversion %{version}
 %endif
-%define         python_pkg_name python38
+%define         python_pkg_name python39
 # Will provide the pyton3-* provides
 # Will do the /usr/bin/python3 and all the core links
 %define         primary_interpreter 0
@@ -124,11 +124,10 @@ Patch07:        python-3.3.0b1-localpath.patch
 Patch08:        python-3.3.0b1-fix_date_time_compiler.patch
 # POSIX_FADV_WILLNEED throws EINVAL. Use a different constant in test
 Patch09:        python-3.3.0b1-test-posix_fadvise.patch
+# Raise timeout value for test_subprocess
+Patch15:        subprocess-raise-timeout.patch
 # skip some tests only for PowerPC
 Patch23:        skip_random_failing_tests.patch
-# Fix SOURCE_DATE_EPOCH problems (bpo#34022, bpo#29708)
-# gh#python/cpython#10775 gh#python/cpython#10327
-Patch24:        bpo34022-stop_hash-based_invalidation_w_SOURCE_DATE_EPOCH.patch
 Patch25:        python3-imp-returntype.patch
 # PATCH-FIX-UPSTREAM CVE-2019-5010-null-defer-x509-cert-DOS.patch bnc#1122191 mcepl@suse.com
 # https://github.com/python/cpython/pull/11569
@@ -385,10 +384,10 @@ other applications.
 %patch07 -p1
 %patch08 -p1
 %patch09 -p1
+%patch15 -p1
 %ifarch ppc ppc64 ppc64le
 %patch23 -p1
 %endif
-%patch24 -p1
 %patch25 -p1
 %patch27 -p1
 %patch29 -p1
@@ -439,6 +438,7 @@ sed -e 's/-fprofile-correction//' -i Makefile.pre.in
 %endif
 
 %configure \
+    --with-platlibdir=%{_lib} \
     --docdir=%{_docdir}/python \
     --enable-ipv6 \
     --enable-shared \
@@ -555,7 +555,7 @@ for module in \
     ensurepip html http \
     importlib json logging multiprocessing pydoc_data unittest \
     urllib venv wsgiref lib2to3 test turtledemo \
-    xml xmlrpc
+    xml xmlrpc zoneinfo
 do
     rm -r %{buildroot}%{sitedir}/$module
 done
@@ -569,7 +569,7 @@ for library in \
     _statistics _struct syslog termios _testbuffer _testimportmultiple \
     _testmultiphase unicodedata zlib _ctypes_test _testinternalcapi _testcapi xxlimited \
     _xxtestfuzz _xxsubinterpreters _elementtree pyexpat _md5 _sha1 \
-    _sha256 _sha512 _blake2 _sha3 _uuid
+    _sha256 _sha512 _blake2 _sha3 _uuid _zoneinfo
 do
     eval rm "%{buildroot}%{sitedir}/lib-dynload/$library.*"
 done
@@ -632,7 +632,7 @@ ln -sf python%{python_version} %{buildroot}%{_bindir}/python3
 %if !%{primary_interpreter}
 # base
 rm %{buildroot}%{_bindir}/python3
-rm %{buildroot}%{_bindir}/pydocs3
+rm %{buildroot}%{_bindir}/pydoc3
 rm %{buildroot}%{_mandir}/man1/python3.1
 # devel
 rm %{buildroot}%{_bindir}/python3-config
@@ -648,7 +648,7 @@ rm %{buildroot}%{_bindir}/idle3*
 
 # delete the generic 2to3 binary if we are not primary
 %if !%{primary_interpreter}
-rm %{buildroot}%{_bindir}2to3
+rm %{buildroot}%{_bindir}/2to3
 %endif
 
 # replace duplicate .pyo/.pyc with hardlinks
@@ -895,6 +895,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
 %{dynlib _xxsubinterpreters}
 %{dynlib _xxtestfuzz}
 %{dynlib zlib}
+%{dynlib _zoneinfo}
 # hashlib fallback modules
 %{dynlib _blake2}
 %{dynlib _md5}
@@ -934,13 +935,16 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo
 %{sitedir}/wsgiref
 %{sitedir}/xml
 %{sitedir}/xmlrpc
+%{sitedir}/zoneinfo
 %{sitedir}/__pycache__
 # import-failed hooks
 %{sitedir}/_import_failed
 %{sitedir}/site-packages/zzzz-import-failed-hooks.pth
 # symlinks
+%if %{primary_interpreter}
 %{_bindir}/python3
 %{_bindir}/pydoc3
+%endif
 # executables
 %attr(755, root, root) %{_bindir}/pydoc%{python_version}
 # %attr(755, root, root) %{_bindir}/python%{python_abi}