From a1c80d368332a94ad606ca990f7ce15f09f697844f3e34a996dc670f8dc95beb Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 16 May 2019 19:20:21 +0000 Subject: [PATCH] Accepting request 703526 from home:TheBlackCat:branches:devel:languages:python:jupyter - Specify which version number is being used to avoid conflicts. OBS-URL: https://build.opensuse.org/request/show/703526 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=6 --- python-nbdime.changes | 5 +++++ python-nbdime.spec | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/python-nbdime.changes b/python-nbdime.changes index cb75668..c842b02 100644 --- a/python-nbdime.changes +++ b/python-nbdime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 16 19:08:20 UTC 2019 - Todd R + +- Specify which version number is being used to avoid conflicts. + ------------------------------------------------------------------- Wed May 15 15:56:00 UTC 2019 - Todd R diff --git a/python-nbdime.spec b/python-nbdime.spec index f67f85a..de10a2c 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -43,7 +43,7 @@ BuildRequires: unzip BuildRequires: zip BuildRequires: python-backports.functools_lru_cache BuildRequires: python-backports.shutil_which -Requires: jupyter-nbdime = %{version} +Requires: jupyter-nbdime = %{mainver} Requires: python-GitPython >= 2.1.6 Requires: python-Jinja2 >= 2.9 Requires: python-colorama @@ -55,17 +55,17 @@ Requires: python-tornado %ifpython2 Requires: python-backports.functools_lru_cache Requires: python-backports.shutil_which -Provides: python-jupyter_nbdime-hg = %{version} -Obsoletes: python-jupyter_nbdime-hg < %{version} -Provides: python-jupyter_nbdime-git = %{version} -Obsoletes: python-jupyter_nbdime-git < %{version} +Provides: python-jupyter_nbdime-hg = %{mainver} +Obsoletes: python-jupyter_nbdime-hg < %{mainver} +Provides: python-jupyter_nbdime-git = %{mainver} +Obsoletes: python-jupyter_nbdime-git < %{mainver} %else Conflicts: python-jupyter_nbdime-hg < 1.0.5 Conflicts: python-jupyter_nbdime-git < 1.0.5 %endif Recommends: python-tabulate -Provides: python-jupyter_nbdime = %{version} -Obsoletes: python-jupyter_nbdime < %{version} +Provides: python-jupyter_nbdime = %{mainver} +Obsoletes: python-jupyter_nbdime < %{mainver} BuildArch: noarch %python_subpackages @@ -93,8 +93,8 @@ Version: %{labver} Summary: A JupyterLab extension for showing Notebook diffs Requires: jupyter-jupyterlab Requires: python3-nbdime = %{mainver} -Provides: python3-jupyter_ipympl_jupyterlab = %{version} -Obsoletes: python3-jupyter_ipympl_jupyterlab < %{version} +Provides: python3-jupyter_nbdime_jupyterlab = %{labver} +Obsoletes: python3-jupyter_nbdime_jupyterlab < %{labver} %description -n jupyter-nbdime-jupyterlab The nbdime package provides tools for diffing and merging of @@ -107,8 +107,8 @@ Summary: Git integration for jupyter-nbdime Group: Development/Languages/Python Requires: git Requires: jupyter-nbdime = %{mainver} -Provides: python3-jupyter_nbdime-git = %{version} -Obsoletes: python3-jupyter_nbdime-git < %{version} +Provides: python3-jupyter_nbdime-git = %{mainver} +Obsoletes: python3-jupyter_nbdime-git < %{mainver} %description -n jupyter-nbdime-git The nbdime package provides tools for diffing and merging of @@ -121,8 +121,8 @@ Summary: Mercurial integration for jupyter-nbdime Group: Development/Languages/Python Requires: jupyter-nbdime = %{mainver} Requires: mercurial -Provides: python3-jupyter_nbdime-hg = %{version} -Obsoletes: python3-jupyter_nbdime-hg < %{version} +Provides: python3-jupyter_nbdime-hg = %{mainver} +Obsoletes: python3-jupyter_nbdime-hg < %{mainver} %description -n jupyter-nbdime-hg The nbdime package provides tools for diffing and merging of