Accepting request 703197 from home:TheBlackCat:branches:devel:languages:python:jupyter

- Add conflicts to jupyter subpackage to more explicitly handle
  file overlaps with old naming scheme.

OBS-URL: https://build.opensuse.org/request/show/703197
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbdime?expand=0&rev=5
This commit is contained in:
Todd R 2019-05-15 16:06:39 +00:00 committed by Git OBS Bridge
parent 63a73b3c4d
commit 6545c3fabd
2 changed files with 10 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 15 15:56:00 UTC 2019 - Todd R <toddrme2178@gmail.com>
- Add conflicts to jupyter subpackage to more explicitly handle
file overlaps with old naming scheme.
-------------------------------------------------------------------
Thu Apr 25 01:59:57 UTC 2019 - Todd R <toddrme2178@gmail.com>

View File

@ -59,6 +59,9 @@ Provides: python-jupyter_nbdime-hg = %{version}
Obsoletes: python-jupyter_nbdime-hg < %{version}
Provides: python-jupyter_nbdime-git = %{version}
Obsoletes: python-jupyter_nbdime-git < %{version}
%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}
@ -77,6 +80,7 @@ Summary: A JupyterLab extension for showing Notebook diffs
Requires: jupyter-nbformat
Requires: jupyter-notebook
Requires: python3-nbdime = %{mainver}
Conflicts: python3-jupyter_nbdime < 1.0.5
%description -n jupyter-nbdime
The nbdime package provides tools for diffing and merging of