pool/python-nbdime
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
Todd R 2019-05-16 19:20:21 +00:00 committed by Git OBS Bridge
parent 6545c3fabd
commit a1c80d3683
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-nbdime.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 16 19:08:20 UTC 2019 - Todd R <toddrme2178@gmail.com>
- Specify which version number is being used to avoid conflicts.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 15 15:56:00 UTC 2019 - Todd R <toddrme2178@gmail.com> Wed May 15 15:56:00 UTC 2019 - Todd R <toddrme2178@gmail.com>

26
python-nbdime.spec
View File

@ -43,7 +43,7 @@ BuildRequires: unzip
BuildRequires: zip BuildRequires: zip
BuildRequires: python-backports.functools_lru_cache BuildRequires: python-backports.functools_lru_cache
BuildRequires: python-backports.shutil_which BuildRequires: python-backports.shutil_which
Requires: jupyter-nbdime = %{version} Requires: jupyter-nbdime = %{mainver}
Requires: python-GitPython >= 2.1.6 Requires: python-GitPython >= 2.1.6
Requires: python-Jinja2 >= 2.9 Requires: python-Jinja2 >= 2.9
Requires: python-colorama Requires: python-colorama
@ -55,17 +55,17 @@ Requires: python-tornado
%ifpython2 %ifpython2
Requires: python-backports.functools_lru_cache Requires: python-backports.functools_lru_cache
Requires: python-backports.shutil_which Requires: python-backports.shutil_which
Provides: python-jupyter_nbdime-hg = %{version} Provides: python-jupyter_nbdime-hg = %{mainver}
Obsoletes: python-jupyter_nbdime-hg < %{version} Obsoletes: python-jupyter_nbdime-hg < %{mainver}
Provides: python-jupyter_nbdime-git = %{version} Provides: python-jupyter_nbdime-git = %{mainver}
Obsoletes: python-jupyter_nbdime-git < %{version} Obsoletes: python-jupyter_nbdime-git < %{mainver}
%else %else
Conflicts: python-jupyter_nbdime-hg < 1.0.5 Conflicts: python-jupyter_nbdime-hg < 1.0.5
Conflicts: python-jupyter_nbdime-git < 1.0.5 Conflicts: python-jupyter_nbdime-git < 1.0.5
%endif %endif
Recommends: python-tabulate Recommends: python-tabulate
Provides: python-jupyter_nbdime = %{version} Provides: python-jupyter_nbdime = %{mainver}
Obsoletes: python-jupyter_nbdime < %{version} Obsoletes: python-jupyter_nbdime < %{mainver}
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages
@ -93,8 +93,8 @@ Version: %{labver}
Summary: A JupyterLab extension for showing Notebook diffs Summary: A JupyterLab extension for showing Notebook diffs
Requires: jupyter-jupyterlab Requires: jupyter-jupyterlab
Requires: python3-nbdime = %{mainver} Requires: python3-nbdime = %{mainver}
Provides: python3-jupyter_ipympl_jupyterlab = %{version} Provides: python3-jupyter_nbdime_jupyterlab = %{labver}
Obsoletes: python3-jupyter_ipympl_jupyterlab < %{version} Obsoletes: python3-jupyter_nbdime_jupyterlab < %{labver}
%description -n jupyter-nbdime-jupyterlab %description -n jupyter-nbdime-jupyterlab
The nbdime package provides tools for diffing and merging of The nbdime package provides tools for diffing and merging of
@ -107,8 +107,8 @@ Summary: Git integration for jupyter-nbdime
Group: Development/Languages/Python Group: Development/Languages/Python
Requires: git Requires: git
Requires: jupyter-nbdime = %{mainver} Requires: jupyter-nbdime = %{mainver}
Provides: python3-jupyter_nbdime-git = %{version} Provides: python3-jupyter_nbdime-git = %{mainver}
Obsoletes: python3-jupyter_nbdime-git < %{version} Obsoletes: python3-jupyter_nbdime-git < %{mainver}
%description -n jupyter-nbdime-git %description -n jupyter-nbdime-git
The nbdime package provides tools for diffing and merging of The nbdime package provides tools for diffing and merging of
@ -121,8 +121,8 @@ Summary: Mercurial integration for jupyter-nbdime
Group: Development/Languages/Python Group: Development/Languages/Python
Requires: jupyter-nbdime = %{mainver} Requires: jupyter-nbdime = %{mainver}
Requires: mercurial Requires: mercurial
Provides: python3-jupyter_nbdime-hg = %{version} Provides: python3-jupyter_nbdime-hg = %{mainver}
Obsoletes: python3-jupyter_nbdime-hg < %{version} Obsoletes: python3-jupyter_nbdime-hg < %{mainver}
%description -n jupyter-nbdime-hg %description -n jupyter-nbdime-hg
The nbdime package provides tools for diffing and merging of The nbdime package provides tools for diffing and merging of