From 3ba3bd6e4574aadedde8d39a446479199fbd3e808af1adc52f37e0629762a137 Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 26 Apr 2019 16:40:21 +0000 Subject: [PATCH] spec-cleaner OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:jupyter/python-ipython?expand=0&rev=11 --- python-ipython-doc.spec | 10 +++++----- python-ipython.spec | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/python-ipython-doc.spec b/python-ipython-doc.spec index c6cd819..5f780e6 100644 --- a/python-ipython-doc.spec +++ b/python-ipython-doc.spec @@ -19,9 +19,9 @@ # This package has to be kept separate from the main package to avoid # dependency loops with most of the core jupyter packages. %define oldpython python +%define doc_ver 7.5.0 Name: python-ipython-doc Version: 7.5.0 -%define doc_ver 7.5.0 Release: 0 Summary: Documentation for python3-jupyter_ipython License: BSD-3-Clause @@ -36,10 +36,6 @@ BuildRequires: python-rpm-macros BuildRequires: unzip Provides: python-ipython-doc = %{version} Provides: %{python_module ipython-doc = %{version}} -BuildArch: noarch -# SECTION test requirements -BuildRequires: python3-ipython-iptest = %{version} -# /SECTION Provides: %{oldpython}-jupyter_ipython-doc = %{version} Obsoletes: %{oldpython}-jupyter_ipython-doc < %{version} Provides: %{oldpython}-jupyter_ipython-doc-html = %{version} @@ -52,6 +48,10 @@ Provides: %{python_module jupyter_ipython-doc-html = %{version}} Obsoletes: %{python_module jupyter_ipython-doc-html < %{version}} Provides: %{python_module jupyter_ipython-doc-pdf = %{version}} Obsoletes: %{python_module jupyter_ipython-doc-pdf < %{version}} +BuildArch: noarch +# SECTION test requirements +BuildRequires: python3-ipython-iptest = %{version} +# /SECTION %ifpython3 Provides: jupyter-ipython-doc = %{version} %endif diff --git a/python-ipython.spec b/python-ipython.spec index 9350977..8238871 100644 --- a/python-ipython.spec +++ b/python-ipython.spec @@ -28,7 +28,6 @@ Group: Development/Languages/Python URL: https://github.com/ipython/ipython Source: https://files.pythonhosted.org/packages/source/i/ipython/ipython-%{version}.tar.gz Source1: https://raw.githubusercontent.com/jupyter/qtconsole/4.0.0/qtconsole/resources/icon/JupyterConsole.svg - BuildRequires: %{python_module backcall} BuildRequires: %{python_module base >= 3.5} BuildRequires: %{python_module setuptools >= 18.5} @@ -50,21 +49,21 @@ Requires: python-simplegeneric > 0.8 Requires: python-traitlets >= 4.2 Requires(post): update-alternatives Requires(postun): update-alternatives +Recommends: jupyter Recommends: python-ipykernel Recommends: python-ipyparallel Recommends: python-ipywidgets -Recommends: jupyter Provides: IPython3 = %{version} Obsoletes: IPython3 < %{version} Provides: python-IPython = %{version} Obsoletes: python-IPython < %{version} +Provides: python-jupyter_ipython = %{version} +Obsoletes: python-jupyter_ipython < %{version} +Provides: jupyter-ipython = %{version} BuildArch: noarch %if %{with ico} BuildRequires: icoutils %endif -Provides: python-jupyter_ipython = %{version} -Obsoletes: python-jupyter_ipython < %{version} -Provides: jupyter-ipython = %{version} %python_subpackages %description