From 29e93e2ad8fb6392ac0a876b35131817702393496b3cc6c5b472b9d24b22c56f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 1 Sep 2020 10:15:32 +0000 Subject: [PATCH] - Synchronize formatting and fixes with python38. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python39?expand=0&rev=23 --- python39.changes | 5 +++++ python39.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/python39.changes b/python39.changes index d5b798a..0b75122 100644 --- a/python39.changes +++ b/python39.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 1 10:15:06 UTC 2020 - Matej Cepl + +- Synchronize formatting and fixes with python38. + ------------------------------------------------------------------- Thu Aug 20 15:41:28 UTC 2020 - Andreas Schwab diff --git a/python39.spec b/python39.spec index 9ad274e..2a97ab4 100644 --- a/python39.spec +++ b/python39.spec @@ -40,7 +40,7 @@ %define python_version %(c=%{_version}; echo ${c:0:3}) # based on the current source tarball %define python_version_abitag %(c=%{python_version}; echo ${c//./}) -# FIXME %define python_version_soname %(c=%{python_version}; echo ${c//./_}) +# FIXME %%define python_version_soname %%(c=%%{python_version}; echo ${c//./_}) %define python_version_soname 3_9 %if 0%(test -n "%{tar_suffix}" && echo 1) %define _version %(echo "%{_version}~%{tar_suffix}") @@ -52,7 +52,7 @@ # Will provide the pyton3-* provides # Will do the /usr/bin/python3 and all the core links %define primary_interpreter 0 -%define folderversion 3.9.0 +%define folderversion %{tarversion} %define tarname Python-%{tarversion} %define sitedir %{_libdir}/python%{python_version} # three possible ABI kinds: m - pymalloc, d - debug build; see PEP 3149 @@ -398,7 +398,7 @@ sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac # fix shebangs - convert /usr/local/bin/python and /usr/bin/env/python to /usr/bin/python3 for dir in Lib Tools; do # find *.py, filter to files that contain bad shebangs - # break up "/""usr" like this to prevent replacing with %{_prefix} + # break up "/""usr" like this to prevent replacing with %%{_prefix} find $dir -name '*.py' -type f -print0 \ | xargs -0 grep -lE '^#! *(/''usr/.*bin/(env +)?)?python' \ | xargs sed -r -i -e '1s@^#![[:space:]]*(/''usr/(local/)?bin/(env +)?)?python([0-9]+(\.[0-9]+)?)?@#!%{_bindir}/python3@' @@ -413,7 +413,7 @@ rm Lib/site-packages/README.txt %build %if %{with doc} -TODAY_DATE=`date -r %{SOURCE0} "+%B %d, %Y"` +TODAY_DATE=`date -r %{SOURCE0} "+%%B %%d, %%Y"` # TODO use not date of tarball but date of latest patch cd Doc @@ -946,7 +946,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo %endif # executables %attr(755, root, root) %{_bindir}/pydoc%{python_version} -# %attr(755, root, root) %{_bindir}/python%{python_abi} +# %%attr(755, root, root) %%{_bindir}/python%%{python_abi} %attr(755, root, root) %{_bindir}/python%{python_version} # endif for if base %endif