From 3017125aa273d3ae8eb783fe01dbf546b06ecdb8e90ee0c30f5203111f0b5473 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Thu, 17 Aug 2023 16:05:14 +0000 Subject: [PATCH] - Suggest primary python package -- boo#1214354 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=42 --- python-nbdime.changes | 5 +++++ python-nbdime.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/python-nbdime.changes b/python-nbdime.changes index ff238c2..a3220bc 100644 --- a/python-nbdime.changes +++ b/python-nbdime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 17 16:04:56 UTC 2023 - Ben Greiner + +- Suggest primary python package -- boo#1214354 + ------------------------------------------------------------------- Wed Jul 19 20:53:11 UTC 2023 - Ben Greiner diff --git a/python-nbdime.spec b/python-nbdime.spec index b5b1b52..57620c7 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -25,7 +25,6 @@ %define pyver 3.2.1 %define labver 2.2.0 %define jupver 6.2.0 -%define anypythondist python3dist # always cut trailing .0 %define pyverdist 3.2.1 %define mainbins nbdime nbshow nbdiff nbdiff-web nbmerge nbmerge-web @@ -98,7 +97,9 @@ This package provides the python interface. %package -n jupyter-nbdime Version: %{jupver} Summary: A JupyterLab extension for showing Notebook diffs -Requires: %{anypythondist}(nbdime) = %{pyverdist} +# Any flavor is okay, but suggest the primary one for automatic zypper choice -- boo#1214354 +Requires: python3dist(nbdime) = %{pyverdist} +Suggests: python3-nbdime Conflicts: python3-jupyter_nbdime < 1.0.5 %description -n jupyter-nbdime @@ -112,7 +113,9 @@ Version: %{labver} Release: 0 Summary: A JupyterLab extension for showing Notebook diffs Requires: jupyter-jupyterlab -Requires: %{anypythondist}(nbdime) = %{pyverdist} +# Any flavor is okay, but suggest the primary one for automatic zypper choice -- boo#1214354 +Requires: python3dist(nbdime) = %{pyverdist} +Suggests: python3-nbdime %description -n jupyter-nbdime-jupyterlab The nbdime package provides tools for diffing and merging of