Compare commits

..

7 Commits
f30 ... master

Author SHA1 Message Date
Charalampos Stratakis
78bc51a18d Package __init__.py within ensurepip's bundled directory
when not using the system installed rpmwheels

Upstream change: https://bugs.python.org/issue37449
2020-01-03 14:25:58 +01:00
Miro Hrončok
d33516835b Rebased to Python 3.9.0a2
No patches changes since 3.9.0a1.
2019-12-19 12:25:44 +01:00
Charalampos Stratakis
620353def6 Build Python with -fno-semantic-interposition
The compiler flag has been added to CFLAGS_NODIST and
LDFLAGS_NODIST. This will compile the core interpreter
and the stdlib modules with -fno-semantic-interposition
but will not affect user build and rpm C extension modules
compiled by distutils.

This has the effect of speeding up the interpreter up to
27%, depending on the workload, with the drawback of disabling
the capability of using LD_PRELOAD to override symbols in
libpython.

https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
2019-12-04 16:36:18 +01:00
Miro Hrončok
fc7d3985d4 Reintroduce the OPENSSL_CONF=/non-existing-file workaround
Since crypto-policies-20191002-1.gitc93dc99.fc32, the maximum version of TLS
is customized in Fedora as well.

See https://bugzilla.redhat.com/show_bug.cgi?id=1778357
and https://bugs.python.org/issue38815

This reverts commit b33b4a5162e2b5873c5846dcba882f3569ab76cd.
2019-12-03 19:09:16 +01:00
Miro Hrončok
9885fc6e12 Recommend python3-tkinter when tk is installed
The tkinter module is part of the Python's standard library, however it is in
a separate subpackage to save an unwanted dependency on tk.

When tk is installed, we recommend the subpackage to provide more upstream-like
experience, but still provide a way out.
2019-11-30 01:15:55 +01:00
Tomas Orsava
83f99db714 New bcond main_python
The bcond flatpackage assumed that if building *without* flatpackage,
that we want to build the main Python for the distribution. However, in
some instances we want a non-flatpackage build of Python that is *not*
the main Python in the distro.
Therefore I have split the main-Python setting into its own bcond.
2019-11-30 01:14:44 +01:00
Miro Hrončok
85bf9e384b Debootstrap Python 3.9
This reverts commit d126d7b2af.

No rebuild is needed, the bootstrapped build should be identical.
2019-11-28 15:53:58 +01:00
9 changed files with 88 additions and 39 deletions

View File

@ -1,4 +1,4 @@
From dd253c4f803a5dfa2ba7dfdb01b722e47c2b02e8 Mon Sep 17 00:00:00 2001 From 5dd33e789d3b70d5021cbceed61494110bbe1540 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com> From: David Malcolm <dmalcolm@redhat.com>
Date: Wed, 13 Jan 2010 21:25:18 +0000 Date: Wed, 13 Jan 2010 21:25:18 +0000
Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard Subject: [PATCH] 00001: Fixup distutils/unixccompiler.py to remove standard
@ -29,5 +29,5 @@ index d10a78da31..4df4b67810 100644
include_dirs=None, extra_preargs=None, extra_postargs=None): include_dirs=None, extra_preargs=None, extra_postargs=None):
fixed_args = self._fix_compile_args(None, macros, include_dirs) fixed_args = self._fix_compile_args(None, macros, include_dirs)
-- --
2.23.0 2.24.1

View File

@ -1,4 +1,4 @@
From 25fcefdafb47ee30f4dc802742f49e501d7b2f37 Mon Sep 17 00:00:00 2001 From 19b5b3386f16f53e34b9d37e400b655dbfe912e8 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com> From: David Malcolm <dmalcolm@redhat.com>
Date: Wed, 13 Jan 2010 21:25:18 +0000 Date: Wed, 13 Jan 2010 21:25:18 +0000
Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/ Subject: [PATCH] 00102: Change the various install paths to use /usr/lib64/
@ -87,7 +87,7 @@ index 287ab1989e..d4c05e0ab1 100644
check_path(cmd.install_headers, check_path(cmd.install_headers,
os.path.join(destination, "include", "python", "foopkg")) os.path.join(destination, "include", "python", "foopkg"))
diff --git a/Lib/site.py b/Lib/site.py diff --git a/Lib/site.py b/Lib/site.py
index a065ab0b5d..22d53fa562 100644 index 2c71798755..653c1d7203 100644
--- a/Lib/site.py --- a/Lib/site.py
+++ b/Lib/site.py +++ b/Lib/site.py
@@ -335,11 +335,15 @@ def getsitepackages(prefixes=None): @@ -335,11 +335,15 @@ def getsitepackages(prefixes=None):
@ -107,7 +107,7 @@ index a065ab0b5d..22d53fa562 100644
return sitepackages return sitepackages
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index b9e2fafbc0..0ae6d35b69 100644 index 64cf1560d9..f66314b203 100644
--- a/Lib/sysconfig.py --- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py +++ b/Lib/sysconfig.py
@@ -20,10 +20,10 @@ __all__ = [ @@ -20,10 +20,10 @@ __all__ = [
@ -198,10 +198,10 @@ index 8632d1fe6d..09a818609e 100644
return DECODE_LOCALE_ERR("EXEC_PREFIX macro", len); return DECODE_LOCALE_ERR("EXEC_PREFIX macro", len);
} }
diff --git a/configure b/configure diff --git a/configure b/configure
index 44f14c3c2c..020531594c 100755 index a2c7ddf595..966a6cae2e 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -15192,9 +15192,9 @@ fi @@ -15205,9 +15205,9 @@ fi
if test x$PLATFORM_TRIPLET = x; then if test x$PLATFORM_TRIPLET = x; then
@ -214,10 +214,10 @@ index 44f14c3c2c..020531594c 100755
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 0b28dda44c..4fca719c71 100644 index 57dca35723..7ba091ebf2 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -4679,9 +4679,9 @@ fi @@ -4689,9 +4689,9 @@ fi
dnl define LIBPL after ABIFLAGS and LDVERSION is defined. dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
AC_SUBST(PY_ENABLE_SHARED) AC_SUBST(PY_ENABLE_SHARED)
if test x$PLATFORM_TRIPLET = x; then if test x$PLATFORM_TRIPLET = x; then
@ -257,5 +257,5 @@ index 02f523c42d..559498d14b 100644
libraries=readline_libs)) libraries=readline_libs))
else: else:
-- --
2.23.0 2.24.1

View File

@ -1,4 +1,4 @@
From 796f2a2d1f213e963768e7c987fb49f8c4f47dfa Mon Sep 17 00:00:00 2001 From f7580af0bf9870c81366613213d4268ef00bff5a Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com> From: David Malcolm <dmalcolm@redhat.com>
Date: Mon, 18 Jan 2010 17:59:07 +0000 Date: Mon, 18 Jan 2010 17:59:07 +0000
Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a Subject: [PATCH] 00111: Don't try to build a libpythonMAJOR.MINOR.a
@ -74,5 +74,5 @@ index 4d2f68447d..3cd2f25571 100644
$(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o $(INSTALL_DATA) Programs/python.o $(DESTDIR)$(LIBPL)/python.o
$(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
-- --
2.23.0 2.24.1

View File

@ -1,4 +1,4 @@
From dad501bdd3ee8d8e22f66416998aeb50c0e7983e Mon Sep 17 00:00:00 2001 From f85b612b86a1e688685fc2f908b50e13d75114bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 15 Aug 2018 15:36:29 +0200 Date: Wed, 15 Aug 2018 15:36:29 +0200
Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels Subject: [PATCH] 00189: Instead of bundled wheels, use our RPM packaged wheels
@ -63,5 +63,5 @@ index 386ed6c25c..19e7c8787e 100644
additional_paths.append(os.path.join(tmpdir, wheel_name)) additional_paths.append(os.path.join(tmpdir, wheel_name))
-- --
2.23.0 2.24.1

View File

@ -1,4 +1,4 @@
From 7438360d65b2e000440d7ee126f32d2500dbd82c Mon Sep 17 00:00:00 2001 From d2eb8a55c088caf1bf48e9d998fbc514b820ad6c Mon Sep 17 00:00:00 2001
From: Michal Cyprian <m.cyprian@gmail.com> From: Michal Cyprian <m.cyprian@gmail.com>
Date: Mon, 26 Jun 2017 16:32:56 +0200 Date: Mon, 26 Jun 2017 16:32:56 +0200
Subject: [PATCH] 00251: Change user install location Subject: [PATCH] 00251: Change user install location
@ -40,7 +40,7 @@ index ae4f915669..0e4fd5b74a 100644
else: else:
if self.exec_prefix is None: if self.exec_prefix is None:
diff --git a/Lib/site.py b/Lib/site.py diff --git a/Lib/site.py b/Lib/site.py
index 22d53fa562..9513526109 100644 index 653c1d7203..9098f5762f 100644
--- a/Lib/site.py --- a/Lib/site.py
+++ b/Lib/site.py +++ b/Lib/site.py
@@ -348,7 +348,14 @@ def getsitepackages(prefixes=None): @@ -348,7 +348,14 @@ def getsitepackages(prefixes=None):
@ -60,5 +60,5 @@ index 22d53fa562..9513526109 100644
if os.path.isdir(sitedir): if os.path.isdir(sitedir):
addsitedir(sitedir, known_paths) addsitedir(sitedir, known_paths)
-- --
2.23.0 2.24.1

View File

@ -1,4 +1,4 @@
From 607b2e6099745b2c8c0d55d258ade620e6c35dbd Mon Sep 17 00:00:00 2001 From 29524bf73ef1d39e21dff0c60f8ff76bd36549cb Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com> From: Petr Viktorin <pviktori@redhat.com>
Date: Mon, 28 Aug 2017 17:16:46 +0200 Date: Mon, 28 Aug 2017 17:16:46 +0200
Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change Subject: [PATCH] 00274: Upstream uses Debian-style architecture naming, change
@ -29,7 +29,7 @@ index ba37cf99e2..52a9ec6662 100755
ppc64le | powerpc64little) ppc64le | powerpc64little)
basic_machine=powerpc64le-unknown basic_machine=powerpc64le-unknown
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 4fca719c71..3d06f82981 100644 index 7ba091ebf2..05a2568f56 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -741,9 +741,9 @@ cat >> conftest.c <<EOF @@ -741,9 +741,9 @@ cat >> conftest.c <<EOF
@ -82,5 +82,5 @@ index 4fca719c71..3d06f82981 100644
s390x-linux-gnu s390x-linux-gnu
# elif defined(__s390__) # elif defined(__s390__)
-- --
2.23.0 2.24.1

View File

@ -1,4 +1,4 @@
From 4c5bee74ff3d4033a60359640bac9f156fdf50ed Mon Sep 17 00:00:00 2001 From d1beb7fb4f912a4beaa2b993919e6d6d019d900d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz> From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 11 Jul 2019 13:44:13 +0200 Date: Thu, 11 Jul 2019 13:44:13 +0200
Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default Subject: [PATCH] 00328: Restore pyc to TIMESTAMP invalidation mode as default
@ -31,7 +31,7 @@ index 21736896af..310bed5620 100644
else: else:
return PycInvalidationMode.TIMESTAMP return PycInvalidationMode.TIMESTAMP
diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py diff --git a/Lib/test/test_py_compile.py b/Lib/test/test_py_compile.py
index d6677ab45f..88059b127e 100644 index d4a68c9320..ed09874023 100644
--- a/Lib/test/test_py_compile.py --- a/Lib/test/test_py_compile.py
+++ b/Lib/test/test_py_compile.py +++ b/Lib/test/test_py_compile.py
@@ -17,6 +17,7 @@ def without_source_date_epoch(fxn): @@ -17,6 +17,7 @@ def without_source_date_epoch(fxn):
@ -51,5 +51,5 @@ index d6677ab45f..88059b127e 100644
return wrapper return wrapper
-- --
2.23.0 2.24.1

View File

@ -14,10 +14,10 @@ URL: https://www.python.org/
# WARNING When rebasing to a new Python version, # WARNING When rebasing to a new Python version,
# remember to update the python3-docs package as well # remember to update the python3-docs package as well
%global general_version %{pybasever}.0 %global general_version %{pybasever}.0
%global prerel a1 %global prerel a2
%global upstream_version %{general_version}%{?prerel} %global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}} Version: %{general_version}%{?prerel:~%{prerel}}
Release: 2%{?dist} Release: 1%{?dist}
License: Python License: Python
@ -30,12 +30,21 @@ License: Python
# Flat package, i.e. python36, python37, python38 for tox etc. # Flat package, i.e. python36, python37, python38 for tox etc.
# warning: changes some other defaults # WARNING: This also influences the main_python bcond below.
# in Fedora, never turn this on for the python3 package # in Fedora, never turn this on for the python3 package
# and always keep it on for python37 etc. # and always keep it on for python37 etc.
# WARNING: This does not change the package name and summary above # WARNING: This does not change the package name and summary above.
%bcond_without flatpackage %bcond_without flatpackage
# Main Python, i.e. whether this is the main Python version in the distribution
# that owns /usr/bin/python3 and other unique paths
# Default: if this is a flatpackage -> it is not the main Python
%if %{with flatpackage}
%bcond_with main_python
%else
%bcond_without main_python
%endif
# When bootstrapping python3, we need to build setuptools. # When bootstrapping python3, we need to build setuptools.
# but setuptools BR python3-devel and that brings in python3-rpm-generators; # but setuptools BR python3-devel and that brings in python3-rpm-generators;
# python3-rpm-generators needs python3-setuptools, so we cannot have it yet. # python3-rpm-generators needs python3-setuptools, so we cannot have it yet.
@ -45,7 +54,7 @@ License: Python
# IMPORTANT: When bootstrapping, it's very likely the wheels for pip and # IMPORTANT: When bootstrapping, it's very likely the wheels for pip and
# setuptools are not available. Turn off the rpmwheels bcond until # setuptools are not available. Turn off the rpmwheels bcond until
# the two packages are built with wheels to get around the issue. # the two packages are built with wheels to get around the issue.
%bcond_without bootstrap %bcond_with bootstrap
# Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package # Whether to use RPM build wheels from the python-{pip,setuptools}-wheel package
# Uses upstream bundled prebuilt wheels otherwise # Uses upstream bundled prebuilt wheels otherwise
@ -311,12 +320,14 @@ Provides: python%{pyshortver} = %{version}-%{release}
# replace python36-3.6.2. # replace python36-3.6.2.
Obsoletes: python%{pyshortver} Obsoletes: python%{pyshortver}
%if %{with main_python}
# https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package # https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package
# https://fedoraproject.org/wiki/Changes/Python_means_Python3 # https://fedoraproject.org/wiki/Changes/Python_means_Python3
# We recommend /usr/bin/python so users get it by default # We recommend /usr/bin/python so users get it by default
# Versioned recommends are problematic, and we know that the package requires # Versioned recommends are problematic, and we know that the package requires
# python3 back with fixed version, so we just use the path here: # python3 back with fixed version, so we just use the path here:
Recommends: %{_bindir}/python Recommends: %{_bindir}/python
%endif
# In Fedora 31, /usr/bin/pydoc was moved here from Python 2. # In Fedora 31, /usr/bin/pydoc was moved here from Python 2.
# Ideally we'd have an explicit conflict with "/usr/bin/pydoc < 3", # Ideally we'd have an explicit conflict with "/usr/bin/pydoc < 3",
@ -358,6 +369,7 @@ Packages containing additional libraries for Python are generally named with
the "%{name}-" prefix. the "%{name}-" prefix.
%if %{with main_python}
# https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package # https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package
# https://fedoraproject.org/wiki/Changes/Python_means_Python3 # https://fedoraproject.org/wiki/Changes/Python_means_Python3
%package -n python-unversioned-command %package -n python-unversioned-command
@ -373,6 +385,8 @@ Provides: python = %{version}-%{release}
%description -n python-unversioned-command %description -n python-unversioned-command
This package contains /usr/bin/python - the "python" command that runs Python 3. This package contains /usr/bin/python - the "python" command that runs Python 3.
%endif # with main_python
%package libs %package libs
Summary: Python runtime libraries Summary: Python runtime libraries
@ -393,6 +407,11 @@ Provides: bundled(python3-setuptools) = 41.2.0
# See https://bugzilla.redhat.com/show_bug.cgi?id=1547131 # See https://bugzilla.redhat.com/show_bug.cgi?id=1547131
Recommends: %{name}%{?_isa} = %{version}-%{release} Recommends: %{name}%{?_isa} = %{version}-%{release}
# tkinter is part of the standard library,
# but it is torn out to save an unwanted dependency on tk and X11.
# we recommend it when tk is already installed (for better UX)
Recommends: (%{name}-tkinter%{?_isa} = %{version}-%{release} if tk%{?_isa})
# https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package # https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package
# In Fedora 31, several "unversioned" files like /usr/bin/pydoc and all the # In Fedora 31, several "unversioned" files like /usr/bin/pydoc and all the
# "unversioned" provides were moved from python2 to python3. # "unversioned" provides were moved from python2 to python3.
@ -648,14 +667,14 @@ topdir=$(pwd)
# Fedora packages utilizing %%py3_build will use them as well # Fedora packages utilizing %%py3_build will use them as well
# https://fedoraproject.org/wiki/Changes/Python_Extension_Flags # https://fedoraproject.org/wiki/Changes/Python_Extension_Flags
export CFLAGS="%{extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv" export CFLAGS="%{extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv"
export CFLAGS_NODIST="%{build_cflags} -D_GNU_SOURCE -fPIC -fwrapv" export CFLAGS_NODIST="%{build_cflags} -D_GNU_SOURCE -fPIC -fwrapv -fno-semantic-interposition"
export CXXFLAGS="%{extension_cxxflags} -D_GNU_SOURCE -fPIC -fwrapv" export CXXFLAGS="%{extension_cxxflags} -D_GNU_SOURCE -fPIC -fwrapv"
export CPPFLAGS="$(pkg-config --cflags-only-I libffi)" export CPPFLAGS="$(pkg-config --cflags-only-I libffi)"
export OPT="%{extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv" export OPT="%{extension_cflags} -D_GNU_SOURCE -fPIC -fwrapv"
export LINKCC="gcc" export LINKCC="gcc"
export CFLAGS="$CFLAGS $(pkg-config --cflags openssl)" export CFLAGS="$CFLAGS $(pkg-config --cflags openssl)"
export LDFLAGS="%{extension_ldflags} -g $(pkg-config --libs-only-L openssl)" export LDFLAGS="%{extension_ldflags} -g $(pkg-config --libs-only-L openssl)"
export LDFLAGS_NODIST="%{build_ldflags} -g $(pkg-config --libs-only-L openssl)" export LDFLAGS_NODIST="%{build_ldflags} -fno-semantic-interposition -g $(pkg-config --libs-only-L openssl)"
# We can build several different configurations of Python: regular and debug. # We can build several different configurations of Python: regular and debug.
# Define a common function that does one build: # Define a common function that does one build:
@ -842,7 +861,7 @@ install -d -m 0755 %{buildroot}%{pylibdir}/site-packages/__pycache__
install -d -m 0755 %{buildroot}%{_prefix}/lib/python%{pybasever}/site-packages/__pycache__ install -d -m 0755 %{buildroot}%{_prefix}/lib/python%{pybasever}/site-packages/__pycache__
%endif %endif
%if %{without flatpackage} %if %{with main_python}
# add idle3 to menu # add idle3 to menu
install -D -m 0644 Lib/idlelib/Icons/idle_16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/idle3.png install -D -m 0644 Lib/idlelib/Icons/idle_16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/idle3.png
install -D -m 0644 Lib/idlelib/Icons/idle_32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/idle3.png install -D -m 0644 Lib/idlelib/Icons/idle_32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/idle3.png
@ -921,7 +940,7 @@ find %{buildroot} -perm 555 -exec chmod 755 {} \;
# Create "/usr/bin/python3-debug", a symlink to the python3 debug binary, to # Create "/usr/bin/python3-debug", a symlink to the python3 debug binary, to
# avoid the user having to know the precise version and ABI flags. # avoid the user having to know the precise version and ABI flags.
# See e.g. https://bugzilla.redhat.com/show_bug.cgi?id=676748 # See e.g. https://bugzilla.redhat.com/show_bug.cgi?id=676748
%if %{with debug_build} && %{without flatpackage} %if %{with debug_build} && %{with main_python}
ln -s \ ln -s \
%{_bindir}/python%{LDVERSION_debug} \ %{_bindir}/python%{LDVERSION_debug} \
%{buildroot}%{_bindir}/python3-debug %{buildroot}%{_bindir}/python3-debug
@ -932,7 +951,7 @@ ln -s \
# See https://bugzilla.redhat.com/show_bug.cgi?id=1111275 # See https://bugzilla.redhat.com/show_bug.cgi?id=1111275
mv %{buildroot}%{_bindir}/2to3-%{pybasever} %{buildroot}%{_bindir}/2to3 mv %{buildroot}%{_bindir}/2to3-%{pybasever} %{buildroot}%{_bindir}/2to3
%if %{with flatpackage} %if %{without main_python}
# Remove stuff that would conflict with python3 package # Remove stuff that would conflict with python3 package
rm %{buildroot}%{_bindir}/python3 rm %{buildroot}%{_bindir}/python3
rm %{buildroot}%{_bindir}/pydoc3 rm %{buildroot}%{_bindir}/pydoc3
@ -1008,6 +1027,15 @@ CheckPython() {
ConfName=$1 ConfName=$1
ConfDir=$(pwd)/build/$ConfName ConfDir=$(pwd)/build/$ConfName
# Fedora sets explicit minimum/maximum TLS versions.
# Python's test suite assumes that the minimum/maximum version is set to
# a magic marker. We workaround the test problem by setting:
export OPENSSL_CONF=/non-existing-file
# https://bugzilla.redhat.com/show_bug.cgi?id=1618753
# https://bugzilla.redhat.com/show_bug.cgi?id=1778357
# https://bugs.python.org/issue35045
# https://bugs.python.org/issue38815
echo STARTING: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName echo STARTING: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
# Note that we're running the tests using the version of the code in the # Note that we're running the tests using the version of the code in the
@ -1052,7 +1080,7 @@ CheckPython optimized
%files %files
%doc README.rst %doc README.rst
%if %{without flatpackage} %if %{with main_python}
%{_bindir}/pydoc* %{_bindir}/pydoc*
%{_bindir}/python3 %{_bindir}/python3
%else %else
@ -1064,11 +1092,15 @@ CheckPython optimized
%{_mandir}/*/*3* %{_mandir}/*/*3*
%if %{with main_python}
%if %{without flatpackage} %if %{without flatpackage}
%files -n python-unversioned-command %files -n python-unversioned-command
%endif
%{_bindir}/python %{_bindir}/python
%{_mandir}/*/python.1* %{_mandir}/*/python.1*
%endif
%if %{without flatpackage}
%files libs %files libs
%doc README.rst %doc README.rst
%endif %endif
@ -1112,6 +1144,8 @@ CheckPython optimized
%else %else
%dir %{pylibdir}/ensurepip/_bundled %dir %{pylibdir}/ensurepip/_bundled
%{pylibdir}/ensurepip/_bundled/*.whl %{pylibdir}/ensurepip/_bundled/*.whl
%{pylibdir}/ensurepip/_bundled/__init__.py
%{pylibdir}/ensurepip/_bundled/__pycache__/*%{bytecode_suffixes}
%endif %endif
%dir %{pylibdir}/concurrent/ %dir %{pylibdir}/concurrent/
@ -1282,13 +1316,16 @@ CheckPython optimized
%{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h} %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
%{_libdir}/%{py_INSTSONAME_optimized} %{_libdir}/%{py_INSTSONAME_optimized}
%if %{without flatpackage} %if %{with main_python}
%{_libdir}/libpython3.so %{_libdir}/libpython3.so
%endif %endif
%if %{without flatpackage} %if %{without flatpackage}
%files devel %files devel
%endif
%if %{with main_python}
%{_bindir}/2to3 %{_bindir}/2to3
%endif %endif
@ -1302,7 +1339,7 @@ CheckPython optimized
%{_includedir}/python%{LDVERSION_optimized}/cpython/ %{_includedir}/python%{LDVERSION_optimized}/cpython/
%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
%if %{without flatpackage} %if %{with main_python}
%{_bindir}/python3-config %{_bindir}/python3-config
%{_bindir}/python-config %{_bindir}/python-config
%{_libdir}/pkgconfig/python3.pc %{_libdir}/pkgconfig/python3.pc
@ -1330,7 +1367,9 @@ CheckPython optimized
%if %{without flatpackage} %if %{without flatpackage}
%files idle %files idle
%endif
%if %{with main_python}
%{_bindir}/idle* %{_bindir}/idle*
%else %else
%{_bindir}/idle%{pybasever} %{_bindir}/idle%{pybasever}
@ -1338,7 +1377,7 @@ CheckPython optimized
%{pylibdir}/idlelib %{pylibdir}/idlelib
%if %{without flatpackage} %if %{with main_python}
%{_metainfodir}/idle3.appdata.xml %{_metainfodir}/idle3.appdata.xml
%{_datadir}/applications/idle3.desktop %{_datadir}/applications/idle3.desktop
%{_datadir}/icons/hicolor/*/apps/idle3.* %{_datadir}/icons/hicolor/*/apps/idle3.*
@ -1390,6 +1429,9 @@ CheckPython optimized
%if %{with debug_build} %if %{with debug_build}
%if %{without flatpackage} %if %{without flatpackage}
%files debug %files debug
%endif
%if %{with main_python}
%{_bindir}/python3-debug %{_bindir}/python3-debug
%{_bindir}/python-debug %{_bindir}/python-debug
%endif %endif
@ -1525,6 +1567,13 @@ CheckPython optimized
# ====================================================== # ======================================================
%changelog %changelog
* Thu Dec 19 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0~a2-1
- Rebased to Python 3.9.0a2
* Wed Dec 04 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0~a1-3
- Build Python with -fno-semantic-interposition for better performance
- https://fedoraproject.org/wiki/Changes/PythonNoSemanticInterpositionSpeedup
* Thu Nov 28 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0~a1-2 * Thu Nov 28 2019 Miro Hrončok <mhroncok@redhat.com> - 3.9.0~a1-2
- Don't remove the test.test_tools module - Don't remove the test.test_tools module

View File

@ -1,2 +1,2 @@
SHA512 (Python-3.9.0a1.tar.xz) = 5880ba1707718dbd21926956faebef3e454b7dae15c880f96140deaff571765a760baa17ca109949b7f70f12c999660ab0071f231f58727e232739d026895e91 SHA512 (Python-3.9.0a2.tar.xz) = 3f17869f3ca4db423f66e145e67c9fb4935d8c908c5362de585898343190edb901861701e27ab9187a287880ee42bbb4897aa298967c1862f44b12dbab19d412
SHA512 (Python-3.9.0a1.tar.xz.asc) = 5c4f31abca1c20be4b7592c97c1fe99ccc3ce494d8905a4aa6d2c96d59207ce7dd6630364a2fe03c9f37c755279c5e3078cba587ccebe165924d2456015d686c SHA512 (Python-3.9.0a2.tar.xz.asc) = 24dc11f516bfc06955742d420b01367330b5b281d6d2292c173ed0e72221004ac3638c98ad6ed36deaaa4ecbaa53d75850a1811153edb94000389429c97cf2b3