Add flatpackage conditionals

This will allow us to create python36 easily once needed [1].
It shoudl also make it easier to merge stuff between python36 and 37.

This more or less backports:

63459d7d2a
7f3ae64d2f
6a6d4a0324

[1] https://fedoraproject.org/wiki/Changes/Python3.7
This commit is contained in:
Miro Hrončok 2018-04-18 14:40:03 +02:00
parent 34ebe3da13
commit 8c67bafd7c

View File

@ -2,19 +2,19 @@
# Top-level metadata # Top-level metadata
# ================== # ==================
Name: python3
Summary: Interpreter of the Python programming language
URL: https://www.python.org/
%global pybasever 3.6 %global pybasever 3.6
# pybasever without the dot: # pybasever without the dot:
%global pyshortver 36 %global pyshortver 36
Name: python3
Summary: Interpreter of the Python programming language
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
Version: %{pybasever}.5 Version: %{pybasever}.5
Release: 1%{?dist} Release: 2%{?dist}
License: Python License: Python
@ -25,6 +25,14 @@ License: Python
# Note that the bcond macros are named for the CLI option they create. # Note that the bcond macros are named for the CLI option they create.
# "%%bcond_without" means "ENABLE by default and create a --without option" # "%%bcond_without" means "ENABLE by default and create a --without option"
# Flat package, i.e. python36, python37, python38 for tox etc.
# warning: changes some other defaults
# in Fedora, never turn this on for the python3 package
# and always keep it on for python36 etc.
# WARNING: This does not change the package name and summary above
%bcond_with flatpackage
# Expensive optimizations (mainly, profile-guided optimizations) # Expensive optimizations (mainly, profile-guided optimizations)
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%bcond_without optimizations %bcond_without optimizations
@ -38,11 +46,19 @@ License: Python
%bcond_without tests %bcond_without tests
# Ability to reuse RPM-installed pip using rewheel # Ability to reuse RPM-installed pip using rewheel
%if %{with flatpackage}
%bcond_with rewheel
%else
%bcond_without rewheel %bcond_without rewheel
%endif
# 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)
%if %{with flatpackage}
%bcond_with debug_build
%else
%bcond_without debug_build %bcond_without debug_build
%endif
# Support for the GDB debugger # Support for the GDB debugger
%bcond_without gdb_hooks %bcond_without gdb_hooks
@ -372,6 +388,8 @@ Patch301: 00301-pathfix-add-n-option-for-no-backup.patch
# Descriptions, and metadata for subpackages # Descriptions, and metadata for subpackages
# ========================================== # ==========================================
%if %{without flatpackage}
# Packages with Python modules in standard locations automatically # Packages with Python modules in standard locations automatically
# depend on python(abi). Provide that here. # depend on python(abi). Provide that here.
Provides: python(abi) = %{pybasever} Provides: python(abi) = %{pybasever}
@ -385,7 +403,7 @@ Obsoletes: system-python < %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# In order to support multiple Python interpreters for development purposes, # In order to support multiple Python interpreters for development purposes,
# packages with with the naming scheme pythonXY (e.g. python35) exist for # packages with the naming scheme flatpackage (e.g. python35) exist for
# non-default versions of Python 3. # non-default versions of Python 3.
# For consistency, and to keep the upgrade path clean, we Provide/Obsolete # For consistency, and to keep the upgrade path clean, we Provide/Obsolete
# these names here. # these names here.
@ -605,6 +623,30 @@ Compiled extension modules use a special ABI flag ("d") in the filename,
so extensions for both versions can co-exist in the same directory. so extensions for both versions can co-exist in the same directory.
%endif # with debug_build %endif # with debug_build
%else # with flatpackage
Requires: redhat-rpm-config
# We'll not provide this, on purpose
# No package in Fedora shall ever depend on flatpackage via this
%global __requires_exclude ^python\\(abi\\) = 3\\..$
%global __provides_exclude ^python\\(abi\\) = 3\\..$
# We keep those inside on purpose
Provides: bundled(python3-pip) = 9.0.3
Provides: bundled(python3-setuptools) = 39.0.1
# The description for the flat package
%description
Python %{pybasever} package for developers.
This package exists to allow developers to test their code against an older
version of Python. This is not a full Python stack and if you wish to run
your applications with Python %{pybasever}, see other distributions
that support it, such as CentOS or RHEL with Software Collections
or older Fedora releases.
%endif # with flatpackage
# ====================================================== # ======================================================
# The prep phase of the build: # The prep phase of the build:
@ -870,6 +912,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}
# 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
@ -880,6 +923,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE10}
mkdir -p %{buildroot}%{_datadir}/appdata mkdir -p %{buildroot}%{_datadir}/appdata
cp -a %{SOURCE11} %{buildroot}%{_datadir}/appdata cp -a %{SOURCE11} %{buildroot}%{_datadir}/appdata
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/idle3.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/idle3.appdata.xml
%endif
# Make sure distutils looks at the right pyconfig.h file # Make sure distutils looks at the right pyconfig.h file
# See https://bugzilla.redhat.com/show_bug.cgi?id=201434 # See https://bugzilla.redhat.com/show_bug.cgi?id=201434
@ -942,15 +986,17 @@ rm -rf %{buildroot}%{_bindir}/__pycache__
# Fixup permissions for shared libraries from non-standard 555 to standard 755: # Fixup permissions for shared libraries from non-standard 555 to standard 755:
find %{buildroot} -perm 555 -exec chmod 755 {} \; find %{buildroot} -perm 555 -exec chmod 755 {} \;
%if %{without flatpackage}
# Install macros for rpm: # Install macros for rpm:
mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/ mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/
install -m 644 %{SOURCE3} %{buildroot}/%{_rpmconfigdir}/macros.d/ install -m 644 %{SOURCE3} %{buildroot}/%{_rpmconfigdir}/macros.d/
install -m 644 %{SOURCE9} %{buildroot}/%{_rpmconfigdir}/macros.d/ install -m 644 %{SOURCE9} %{buildroot}/%{_rpmconfigdir}/macros.d/
%endif
# 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} %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
@ -958,9 +1004,24 @@ ln -s \
# System Python: Link the executable to libexec # System Python: Link the executable to libexec
# This is for backwards compatibility only and should be removed in Fedora 29 # This is for backwards compatibility only and should be removed in Fedora 29
%if %{without flatpackage}
mkdir -p %{buildroot}%{_libexecdir} mkdir -p %{buildroot}%{_libexecdir}
ln -s %{_bindir}/python%{pybasever} %{buildroot}%{_libexecdir}/system-python ln -s %{_bindir}/python%{pybasever} %{buildroot}%{_libexecdir}/system-python
%endif
%if %{with flatpackage}
# Remove stuff that would conflict with python3 package
rm %{buildroot}%{_bindir}/python3
rm %{buildroot}%{_bindir}/pydoc3
rm %{buildroot}%{_bindir}/pathfix.py
rm %{buildroot}%{_bindir}/idle3
rm %{buildroot}%{_bindir}/python3-*
rm %{buildroot}%{_bindir}/pyvenv
rm %{buildroot}%{_bindir}/2to3*
rm %{buildroot}%{_libdir}/libpython3.so
rm %{buildroot}%{_mandir}/man1/python3.1*
rm %{buildroot}%{_libdir}/pkgconfig/python3.pc
%endif
# ====================================================== # ======================================================
# Checks for packaging issues # Checks for packaging issues
@ -1052,26 +1113,37 @@ CheckPython optimized
%defattr(-, root, root) %defattr(-, root, root)
%license LICENSE %license LICENSE
%doc README.rst %doc README.rst
%if %{without flatpackage}
%{_bindir}/pydoc* %{_bindir}/pydoc*
%{_bindir}/python3 %{_bindir}/python3
%{_bindir}/python%{pybasever}
%{_bindir}/python%{pybasever}m
%{_bindir}/pyvenv %{_bindir}/pyvenv
%{_bindir}/pyvenv-%{pybasever}
%{_mandir}/*/* %{_mandir}/*/*
%{_bindir}/pyvenv
# Remove in Fedora 29: # Remove in Fedora 29:
%{_libexecdir}/system-python %{_libexecdir}/system-python
%else
%{_bindir}/pydoc%{pybasever}
%{_mandir}/*/python%{pybasever}*
%endif
%{_bindir}/pyvenv-%{pybasever}
%{_bindir}/python%{pybasever}
%{_bindir}/python%{pybasever}m
%if %{without flatpackage}
%files libs %files libs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%license LICENSE %license LICENSE
%doc README.rst %doc README.rst
%endif
%dir %{pylibdir} %dir %{pylibdir}
%dir %{dynload_dir} %dir %{dynload_dir}
%{pylibdir}/lib2to3 %{pylibdir}/lib2to3
%if %{without flatpackage}
%exclude %{pylibdir}/lib2to3/tests %exclude %{pylibdir}/lib2to3/tests
%endif
%dir %{pylibdir}/unittest/ %dir %{pylibdir}/unittest/
%dir %{pylibdir}/unittest/__pycache__/ %dir %{pylibdir}/unittest/__pycache__/
@ -1096,7 +1168,13 @@ CheckPython optimized
%dir %{pylibdir}/ensurepip/__pycache__/ %dir %{pylibdir}/ensurepip/__pycache__/
%{pylibdir}/ensurepip/*.py %{pylibdir}/ensurepip/*.py
%{pylibdir}/ensurepip/__pycache__/*%{bytecode_suffixes} %{pylibdir}/ensurepip/__pycache__/*%{bytecode_suffixes}
%if %{without flatpackage}
%exclude %{pylibdir}/ensurepip/_bundled %exclude %{pylibdir}/ensurepip/_bundled
%else
%dir %{pylibdir}/ensurepip/_bundled
%{pylibdir}/ensurepip/_bundled/*.whl
%endif
%if %{with rewheel} %if %{with rewheel}
%dir %{pylibdir}/ensurepip/rewheel/ %dir %{pylibdir}/ensurepip/rewheel/
@ -1255,8 +1333,10 @@ CheckPython optimized
%{pylibdir}/sqlite3/*.py %{pylibdir}/sqlite3/*.py
%{pylibdir}/sqlite3/__pycache__/*%{bytecode_suffixes} %{pylibdir}/sqlite3/__pycache__/*%{bytecode_suffixes}
%if %{without flatpackage}
%exclude %{pylibdir}/turtle.py %exclude %{pylibdir}/turtle.py
%exclude %{pylibdir}/__pycache__/turtle*%{bytecode_suffixes} %exclude %{pylibdir}/__pycache__/turtle*%{bytecode_suffixes}
%endif
%{pylibdir}/urllib %{pylibdir}/urllib
%{pylibdir}/xml %{pylibdir}/xml
@ -1276,43 +1356,68 @@ 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}
%{_libdir}/libpython3.so %{_libdir}/libpython3.so
%endif
%if %{without flatpackage}
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/2to3 %{_bindir}/2to3
# TODO: Remove 2to3-3.7 once rebased to 3.7 # TODO: Remove 2to3-3.7 once rebased to 3.7
%{_bindir}/2to3-%{pybasever} %{_bindir}/2to3-%{pybasever}
%endif
%{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/* %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/*
%if %{without flatpackage}
%exclude %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/Makefile %exclude %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/Makefile
%exclude %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
%endif
%{pylibdir}/distutils/command/wininst-*.exe %{pylibdir}/distutils/command/wininst-*.exe
%{_includedir}/python%{LDVERSION_optimized}/*.h %{_includedir}/python%{LDVERSION_optimized}/*.h
%exclude %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
%if %{without flatpackage}
%{_bindir}/python3-config %{_bindir}/python3-config
%{_bindir}/python%{pybasever}-config
%{_bindir}/python%{LDVERSION_optimized}-config
%{_bindir}/python%{LDVERSION_optimized}-*-config
%{_bindir}/pathfix.py
%{_libdir}/libpython%{LDVERSION_optimized}.so
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
%{_libdir}/pkgconfig/python-%{pybasever}.pc
%{_libdir}/pkgconfig/python3.pc %{_libdir}/pkgconfig/python3.pc
%{_rpmconfigdir}/macros.d/macros.pybytecompile%{pybasever} %{_rpmconfigdir}/macros.d/macros.pybytecompile%{pybasever}
%{_rpmconfigdir}/macros.d/macros.systempython %{_rpmconfigdir}/macros.d/macros.systempython
%{_bindir}/pathfix.py
%endif
%{_bindir}/python%{pybasever}-config
%{_bindir}/python%{LDVERSION_optimized}-config
%{_bindir}/python%{LDVERSION_optimized}-*-config
%{_libdir}/libpython%{LDVERSION_optimized}.so
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
%{_libdir}/pkgconfig/python-%{pybasever}.pc
%if %{without flatpackage}
%files idle %files idle
%defattr(-,root,root,755) %defattr(-,root,root,755)
%{_bindir}/idle* %{_bindir}/idle*
%else
%{_bindir}/idle%{pybasever}
%endif
%{pylibdir}/idlelib %{pylibdir}/idlelib
%if %{without flatpackage}
%{_datadir}/appdata/idle3.appdata.xml %{_datadir}/appdata/idle3.appdata.xml
%{_datadir}/applications/idle3.desktop %{_datadir}/applications/idle3.desktop
%{_datadir}/icons/hicolor/*/apps/idle3.* %{_datadir}/icons/hicolor/*/apps/idle3.*
%endif
%if %{without flatpackage}
%files tkinter %files tkinter
%defattr(-,root,root,755) %defattr(-,root,root,755)
%endif
%{pylibdir}/tkinter %{pylibdir}/tkinter
%if %{without flatpackage}
%exclude %{pylibdir}/tkinter/test %exclude %{pylibdir}/tkinter/test
%endif
%{dynload_dir}/_tkinter.%{SOABI_optimized}.so %{dynload_dir}/_tkinter.%{SOABI_optimized}.so
%{pylibdir}/turtle.py %{pylibdir}/turtle.py
%{pylibdir}/__pycache__/turtle*%{bytecode_suffixes} %{pylibdir}/__pycache__/turtle*%{bytecode_suffixes}
@ -1322,8 +1427,10 @@ CheckPython optimized
%dir %{pylibdir}/turtledemo/__pycache__/ %dir %{pylibdir}/turtledemo/__pycache__/
%{pylibdir}/turtledemo/__pycache__/*%{bytecode_suffixes} %{pylibdir}/turtledemo/__pycache__/*%{bytecode_suffixes}
%if %{without flatpackage}
%files test %files test
%defattr(-, root, root) %defattr(-, root, root)
%endif
%{pylibdir}/ctypes/test %{pylibdir}/ctypes/test
%{pylibdir}/distutils/tests %{pylibdir}/distutils/tests
%{pylibdir}/sqlite3/test %{pylibdir}/sqlite3/test
@ -1344,12 +1451,14 @@ CheckPython optimized
# all of the other subpackages # all of the other subpackages
%if %{with debug_build} %if %{with debug_build}
%if %{without flatpackage}
%files debug %files debug
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/python3-debug
%endif
# Analog of the core subpackage's files: # Analog of the core subpackage's files:
%{_bindir}/python%{LDVERSION_debug} %{_bindir}/python%{LDVERSION_debug}
%{_bindir}/python3-debug
# Analog of the -libs subpackage's files: # Analog of the -libs subpackage's files:
# ...with debug builds of the built-in "extension" modules: # ...with debug builds of the built-in "extension" modules:
@ -1470,6 +1579,9 @@ CheckPython optimized
# ====================================================== # ======================================================
%changelog %changelog
* Wed Apr 18 2018 Miro Hrončok <mhroncok@redhat.com> - 3.6.5-2
- Add flatpackage conditionals
* Thu Mar 29 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.6.5-1 * Thu Mar 29 2018 Charalampos Stratakis <cstratak@redhat.com> - 3.6.5-1
- Update to 3.6.5 - Update to 3.6.5