From 6545c3fabdc24b2abe285f6d7c4d28b9205538718da4573bbaaac0b40e803328 Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 15 May 2019 16:06:39 +0000 Subject: [PATCH] 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 --- python-nbdime.changes | 6 ++++++ python-nbdime.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/python-nbdime.changes b/python-nbdime.changes index f0a2312..cb75668 100644 --- a/python-nbdime.changes +++ b/python-nbdime.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 15 15:56:00 UTC 2019 - Todd R + +- 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 diff --git a/python-nbdime.spec b/python-nbdime.spec index 9fab1f7..f67f85a 100644 --- a/python-nbdime.spec +++ b/python-nbdime.spec @@ -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