From 94d211adafdb23e4284967143efe97519b74093f342cd5a5309ebf25baab6dc6 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Wed, 25 Sep 2024 13:01:20 +0000 Subject: [PATCH] - The command replacement for kernelspec python3 was inactive since v6.13. A plain python command is transformed correctly by the calling interpreter. - Conflict with old Python 3.6 package on SLE/Leap for python3 kernelspec OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-ipykernel?expand=0&rev=112 --- python-ipykernel.changes | 8 +++++--- python-ipykernel.spec | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python-ipykernel.changes b/python-ipykernel.changes index d56795c..8e55be7 100644 --- a/python-ipykernel.changes +++ b/python-ipykernel.changes @@ -1,9 +1,11 @@ ------------------------------------------------------------------- Wed Sep 25 12:42:14 UTC 2024 - Ben Greiner -- Always install the python3 kernelspec. The command replacement - was inactive since v6.13. A plain python command is transformed - correctly by the calling interpreter. +- The command replacement for kernelspec python3 was inactive since + v6.13. A plain python command is transformed correctly by the + calling interpreter. +- Conflict with old Python 3.6 package on SLE/Leap for python3 + kernelspec ------------------------------------------------------------------- Fri Aug 30 09:27:37 UTC 2024 - Ben Greiner diff --git a/python-ipykernel.spec b/python-ipykernel.spec index b612c6e..43374a3 100644 --- a/python-ipykernel.spec +++ b/python-ipykernel.spec @@ -32,6 +32,10 @@ Provides: %{python_module jupyter_ipykernel-doc = %{version}} Obsoletes: %{python_module jupyter_ipykernel-doc < %{version}} Provides: %{python_module jupyter-ipykernel-doc = %{version}} Obsoletes: %{python_module jupyter-ipykernel-doc < %{version}} +%if %{suse_version} <= 1600 +# python311-ipykernel and python3-ipykernel cannot both provide the kernelspec +Conflicts: python3-ipykernel +%endif BuildArch: noarch # SECTION build-system BuildRequires: %{python_module base >= 3.8} @@ -124,6 +128,8 @@ donttest="$donttest or test_do_apply" %{python_sitelib}/ipykernel-%{version}*-info %pycache_only %{python_sitelib}/__pycache__/ipykernel_launcher*.pyc %{_jupyter_kernel_dir}/python%{python_bin_suffix} +%if "%{python_flavor}" == "python3" || "%{python_provides}" == "python3" || 0%{?suse_version} <= 1600 %{_jupyter_kernel_dir}/python3 +%endif %changelog