From 9762e52ed69fdd725ace62c30a9c47afc9b5806ac9f2609c8d283e14c82670ba Mon Sep 17 00:00:00 2001
From: Todd R <toddrme2178@gmail.com>
Date: Fri, 17 May 2019 18:11:53 +0000
Subject: [PATCH] Accepting request 703753 from
 home:TheBlackCat:branches:devel:languages:python:jupyter

- Move executable to python package to avoid conflicts with old naming scheme.  It should be moved back with the next release.

OBS-URL: https://build.opensuse.org/request/show/703753
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-nbformat?expand=0&rev=3
---
 python-nbformat.changes | 6 ++++++
 python-nbformat.spec    | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/python-nbformat.changes b/python-nbformat.changes
index 1cf9402..2fedac7 100644
--- a/python-nbformat.changes
+++ b/python-nbformat.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 17 18:09:29 UTC 2019 - Todd R <toddrme2178@gmail.com>
+
+- Move executable to python package to avoid conflicts with old
+  naming scheme.  It should be moved back with the next release.
+
 -------------------------------------------------------------------
 Thu Apr 25 01:59:57 UTC 2019 - Todd R <toddrme2178@gmail.com>
 
diff --git a/python-nbformat.spec b/python-nbformat.spec
index e11206e..6763bc4 100644
--- a/python-nbformat.spec
+++ b/python-nbformat.spec
@@ -34,6 +34,7 @@ Requires:       python-jsonschema > 2.5.0
 Requires:       python-jupyter_core
 Requires:       python-traitlets >= 4.1
 Provides:       python-jupyter_nbformat = %{version}
+# Change <= to < with next release after 4.4
 Obsoletes:      python-jupyter_nbformat <= %{version}
 BuildArch:      noarch
 %python_subpackages
@@ -48,6 +49,8 @@ This package provides the python interface.
 Summary:        The Jupyter Notebook format
 Requires:       jupyter-jupyter_core
 Requires:       python3-nbformat = %{version}
+# uncomment with next release after 4.4:
+# Conflicts:      python3-jupyter_nbformat <= 4.5
 
 %description -n jupyter-nbformat
 This package contains the base implementation of the Jupyter Notebook format,
@@ -70,9 +73,10 @@ This package provides the jupyter components.
 %doc README.md
 %{python_sitelib}/nbformat-%{version}-py*.egg-info
 %{python_sitelib}/nbformat/
+# Move this to jupyter-nbformat with next release (after 4.4)
+%{_bindir}/jupyter-trust
 
 %files -n jupyter-nbformat
 %license COPYING.md
-%{_bindir}/jupyter-trust
 
 %changelog