diff --git a/python311.changes b/python311.changes index 7627d8b..8462f56 100644 --- a/python311.changes +++ b/python311.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 21 14:19:53 UTC 2022 - Matej Cepl + +- Switch from %primary_interpreter to prjconf-defined + %primary_python (gh#openSUSE/python-rpm-macros#127). + ------------------------------------------------------------------- Thu Jul 14 15:37:35 UTC 2022 - Matej Cepl diff --git a/python311.spec b/python311.spec index 1fdfb43..37fae4c 100644 --- a/python311.spec +++ b/python311.spec @@ -36,6 +36,8 @@ %bcond_without general %endif +%define python_pkg_name python311 + %if 0%{?sle_version} && 0%{?suse_version} < 1550 # Obsoleting previous "latest" Python versions # Next versions will get more lines like for older versions @@ -59,10 +61,6 @@ Obsoletes: python39%{?1:-%{1}} %else %define tarversion %{version} %endif -%define python_pkg_name python311 -# Will provide the python3-* provides -# Will do the /usr/bin/python3 and all the core links -%define primary_interpreter 0 # We don't process beta signs well %define folderversion 3.11.0 %define tarname Python-%{tarversion} @@ -213,7 +211,7 @@ Recommends: %{python_pkg_name}-curses Recommends: %{python_pkg_name}-dbm Recommends: %{python_pkg_name}-pip %obsolete_python_versioned -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3 = %{python_version} %endif %endif @@ -236,7 +234,7 @@ development environment (python3-idle). Summary: TkInter, a Python Tk Interface Requires: %{python_pkg_name} = %{version} %obsolete_python_versioned tk -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-tk = %{version} %endif @@ -247,7 +245,7 @@ Python interface to Tk. Tk is the GUI toolkit that comes with Tcl. Summary: Python Interface to the (N)Curses Library Requires: %{python_pkg_name} = %{version} %obsolete_python_versioned curses -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-curses %endif @@ -259,7 +257,7 @@ Console User Interface. Summary: Python Interface to the GDBM Library Requires: %{python_pkg_name} = %{version} %obsolete_python_versioned dbm -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-dbm %endif @@ -272,7 +270,7 @@ Summary: An Integrated Development Environment for Python Requires: %{python_pkg_name} = %{version} Requires: %{python_pkg_name}-tk %obsolete_python_versioned idle -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-idle = %{version} %endif @@ -286,7 +284,7 @@ a debugger. Summary: Package Documentation for Python 3 Enhances: %{python_pkg_name} = %{python_version} %obsolete_python_versioned doc -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-doc = %{version} %endif @@ -298,7 +296,7 @@ Python, and Macintosh Module Reference in HTML format. %package -n %{python_pkg_name}-doc-devhelp Summary: Additional Package Documentation for Python 3 in devhelp format %obsolete_python_versioned doc-devhelp -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-doc-devhelp = %{version} %endif @@ -325,7 +323,7 @@ Provides: %{python_pkg_name}-typing = %{version} %obsolete_python_versioned typing # python3-xml was merged into python3, now moved into -base Provides: %{python_pkg_name}-xml = %{version} -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-asyncio = %{version} Obsoletes: python3-asyncio < %{version} Provides: python3-base = %{version} @@ -353,7 +351,7 @@ Requires: %{python_pkg_name}-base = %{version} Provides: %{python_pkg_name}-2to3 = %{version} Provides: %{python_pkg_name}-demo = %{version} %obsolete_python_versioned tools -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-2to3 = %{version} Provides: python3-demo = %{version} Provides: python3-tools = %{version} @@ -369,7 +367,7 @@ and a set of demonstration programs. Summary: Include Files and Libraries Mandatory for Building Python Modules Requires: %{python_pkg_name}-base = %{version} %obsolete_python_versioned devel -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-devel = %{version} %endif @@ -389,7 +387,7 @@ Summary: Unit tests for Python and its standard library Requires: %{python_pkg_name} = %{version} Requires: %{python_pkg_name}-tk = %{version} %obsolete_python_versioned testsuite -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" Provides: python3-testsuite = %{version} %endif @@ -433,7 +431,7 @@ other applications. # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" # 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 @@ -693,7 +691,7 @@ rm -fv %{buildroot}%{dynlib nis} ln -sf python%{python_version} %{buildroot}%{_bindir}/python3 # decide to ship python3 or just python3.X -%if !%{primary_interpreter} +%if "%{python_pkg_name}" != "%{primary_python}" # base rm %{buildroot}%{_bindir}/python3 rm %{buildroot}%{_bindir}/pydoc3 @@ -711,7 +709,7 @@ ln -s ../../libpython%{python_abi}.so %{buildroot}%{_libdir}/python%{python_vers rm %{buildroot}%{_bindir}/idle3* # delete the generic 2to3 binary if we are not primary -%if !%{primary_interpreter} +%if "%{python_pkg_name}" != "%{primary_python}" rm %{buildroot}%{_bindir}/2to3 %endif @@ -741,7 +739,7 @@ install -m 755 -D Tools/gdb/libpython.py %{buildroot}%{_datadir}/gdb/auto-load/% #cp Makefile Makefile.pre.in Makefile.pre $RPM_BUILD_ROOT%{sitedir}/config-%{python_abi}/ # RPM macros -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/ install -m 644 %{SOURCE7} %{buildroot}%{_rpmconfigdir}/macros.d/ # macros.python3 %endif @@ -843,7 +841,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo %files -n %{python_pkg_name}-tools %defattr(644, root, root, 755) %{sitedir}/turtledemo -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" %{_bindir}/2to3 %endif %attr(755, root, root)%{_bindir}/2to3-%{python_version} @@ -852,7 +850,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo %files -n %{python_pkg_name}-devel %defattr(644, root, root, 755) %{_libdir}/libpython%{python_abi}.so -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" %{_libdir}/libpython3.so %endif %{_libdir}/pkgconfig/* @@ -860,7 +858,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo %{sitedir}/config-%{python_abi}-* %defattr(755, root, root) %{_bindir}/python%{python_abi}-config -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" %{_bindir}/python3-config %endif # Own these directories to not depend on gdb @@ -893,14 +891,14 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo %doc %{_docdir}/%{name}/README.rst %license LICENSE %doc %{_docdir}/%{name}/README.SUSE -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" %{_mandir}/man1/python3.1%{?ext_man} %endif %{_mandir}/man1/python%{python_version}.1%{?ext_man} # license text, not a doc because the code can use it at run-time %{sitedir}/LICENSE.txt # RPM macros -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" %{_rpmconfigdir}/macros.d/macros.python3 %endif # binary parts @@ -1009,7 +1007,7 @@ echo %{sitedir}/_import_failed > %{buildroot}/%{sitedir}/site-packages/zzzz-impo %{sitedir}/_import_failed %{sitedir}/site-packages/zzzz-import-failed-hooks.pth # symlinks -%if %{primary_interpreter} +%if "%{python_pkg_name}" == "%{primary_python}" %{_bindir}/python3 %{_bindir}/pydoc3 %endif