Compare commits
No commits in common. "46a71c2178865214182575dbefb3d872375b144e" and "69c5990bb193c9b50a0185000a71f899e9555211" have entirely different histories.
46a71c2178
...
69c5990bb1
66
python3.spec
66
python3.spec
@ -17,7 +17,7 @@ URL: https://www.python.org/
|
|||||||
#global prerel ...
|
#global prerel ...
|
||||||
%global upstream_version %{general_version}%{?prerel}
|
%global upstream_version %{general_version}%{?prerel}
|
||||||
Version: %{general_version}%{?prerel:~%{prerel}}
|
Version: %{general_version}%{?prerel:~%{prerel}}
|
||||||
Release: 2.1.riscv64%{?dist}
|
Release: 1.0.riscv64%{?dist}
|
||||||
License: Python
|
License: Python
|
||||||
|
|
||||||
|
|
||||||
@ -30,21 +30,12 @@ License: Python
|
|||||||
|
|
||||||
|
|
||||||
# Flat package, i.e. python36, python37, python38 for tox etc.
|
# Flat package, i.e. python36, python37, python38 for tox etc.
|
||||||
# WARNING: This also influences the main_python bcond below.
|
# warning: changes some other defaults
|
||||||
# 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_with flatpackage
|
%bcond_with 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.
|
||||||
@ -54,17 +45,17 @@ 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_with bootstrap
|
%bcond_without 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
|
||||||
%bcond_without rpmwheels
|
%bcond_with rpmwheels
|
||||||
|
|
||||||
# Expensive optimizations (mainly, profile-guided optimizations)
|
# Expensive optimizations (mainly, profile-guided optimizations)
|
||||||
%bcond_without optimizations
|
%bcond_without optimizations
|
||||||
|
|
||||||
# Run the test suite in %%check
|
# Run the test suite in %%check
|
||||||
%bcond_without tests
|
%bcond_with tests
|
||||||
|
|
||||||
# Extra build for debugging the interpreter or C-API extensions
|
# Extra build for debugging the interpreter or C-API extensions
|
||||||
# (the -debug subpackages)
|
# (the -debug subpackages)
|
||||||
@ -320,14 +311,12 @@ 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",
|
||||||
@ -369,7 +358,6 @@ 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
|
||||||
@ -385,8 +373,6 @@ 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
|
||||||
@ -407,11 +393,6 @@ 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.
|
||||||
@ -861,7 +842,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 %{with main_python}
|
%if %{without flatpackage}
|
||||||
# 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
|
||||||
@ -944,7 +925,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} && %{with main_python}
|
%if %{with debug_build} && %{without flatpackage}
|
||||||
ln -s \
|
ln -s \
|
||||||
%{_bindir}/python%{LDVERSION_debug} \
|
%{_bindir}/python%{LDVERSION_debug} \
|
||||||
%{buildroot}%{_bindir}/python3-debug
|
%{buildroot}%{_bindir}/python3-debug
|
||||||
@ -955,7 +936,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 %{without main_python}
|
%if %{with flatpackage}
|
||||||
# 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
|
||||||
@ -1056,9 +1037,6 @@ CheckPython() {
|
|||||||
%ifarch %{mips64}
|
%ifarch %{mips64}
|
||||||
-x test_ctypes \
|
-x test_ctypes \
|
||||||
%endif
|
%endif
|
||||||
%ifarch riscv64
|
|
||||||
-x test_posix \
|
|
||||||
%endif
|
|
||||||
|
|
||||||
echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
|
echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName
|
||||||
|
|
||||||
@ -1078,7 +1056,7 @@ CheckPython optimized
|
|||||||
%files
|
%files
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
|
|
||||||
%if %{with main_python}
|
%if %{without flatpackage}
|
||||||
%{_bindir}/pydoc*
|
%{_bindir}/pydoc*
|
||||||
%{_bindir}/python3
|
%{_bindir}/python3
|
||||||
%else
|
%else
|
||||||
@ -1090,15 +1068,11 @@ 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
|
||||||
@ -1312,16 +1286,13 @@ CheckPython optimized
|
|||||||
%{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
|
%{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
|
||||||
|
|
||||||
%{_libdir}/%{py_INSTSONAME_optimized}
|
%{_libdir}/%{py_INSTSONAME_optimized}
|
||||||
%if %{with main_python}
|
%if %{without flatpackage}
|
||||||
%{_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
|
||||||
|
|
||||||
@ -1335,7 +1306,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 %{with main_python}
|
%if %{without flatpackage}
|
||||||
%{_bindir}/python3-config
|
%{_bindir}/python3-config
|
||||||
%{_bindir}/python-config
|
%{_bindir}/python-config
|
||||||
%{_libdir}/pkgconfig/python3.pc
|
%{_libdir}/pkgconfig/python3.pc
|
||||||
@ -1363,9 +1334,7 @@ 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}
|
||||||
@ -1373,7 +1342,7 @@ CheckPython optimized
|
|||||||
|
|
||||||
%{pylibdir}/idlelib
|
%{pylibdir}/idlelib
|
||||||
|
|
||||||
%if %{with main_python}
|
%if %{without flatpackage}
|
||||||
%{_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.*
|
||||||
@ -1425,9 +1394,6 @@ 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
|
||||||
@ -1563,12 +1529,6 @@ CheckPython optimized
|
|||||||
# ======================================================
|
# ======================================================
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sun Dec 01 2019 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.8.0-2.1.riscv64
|
|
||||||
- Disable test_posix test on riscv64 (failing)
|
|
||||||
|
|
||||||
* Thu Nov 28 2019 Miro Hrončok <mhroncok@redhat.com> - 3.8.0-2
|
|
||||||
- Recommend python3-tkinter when tk is installed
|
|
||||||
|
|
||||||
* Mon Oct 14 2019 Miro Hrončok <mhroncok@redhat.com> - 3.8.0-1
|
* Mon Oct 14 2019 Miro Hrončok <mhroncok@redhat.com> - 3.8.0-1
|
||||||
- Update to Python 3.8.0 final
|
- Update to Python 3.8.0 final
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user