diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..fcc7b97
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,3 @@
+
+ test
+
diff --git a/jupyter-notebook.pdf b/jupyter-notebook.pdf
deleted file mode 100644
index c76e3dc..0000000
--- a/jupyter-notebook.pdf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b29c9ab6fda5040419e1741d9302184e3d7e367bb77a6035d977a343f312b492
-size 1794629
diff --git a/jupyter-notebook.zip b/jupyter-notebook.zip
deleted file mode 100644
index 7bde696..0000000
--- a/jupyter-notebook.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc447d1a23cbcd6b8834f77c4e7050ab8e0437c72f579513e02b1241e3bcc26f
-size 13544559
diff --git a/notebook-6.0.2.tar.gz b/notebook-6.0.2.tar.gz
deleted file mode 100644
index 2e8635e..0000000
--- a/notebook-6.0.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:399a4411e171170173344761e7fd4491a3625659881f76ce47c50231ed714d9b
-size 14069764
diff --git a/notebook-6.0.3.tar.gz b/notebook-6.0.3.tar.gz
new file mode 100644
index 0000000..f18566c
--- /dev/null
+++ b/notebook-6.0.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48
+size 14048151
diff --git a/python-notebook.changes b/python-notebook.changes
index eed9901..7a2b0af 100644
--- a/python-notebook.changes
+++ b/python-notebook.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Jan 28 15:20:00 UTC 2020 - Todd R
+
+- Update to 6.0.3
+ * Dependency updates to fix startup issues on Windows platform
+ * Add support for nbconvert 6.x
+ * Creation of recent tab
+- Use multibuild to separate out tests.
+ The tests have some heavy dependencies the main package doesn't.
+- Drop documentation.
+ These are mostly a relic of when the tests needed to be in a
+ separate package, and since the docs are no longer versioned
+ upstream keeping them synced with the main package is difficult.
+
-------------------------------------------------------------------
Wed Nov 13 14:42:24 UTC 2019 - Todd R
diff --git a/python-notebook.spec b/python-notebook.spec
index fb160ac..7ad002a 100644
--- a/python-notebook.spec
+++ b/python-notebook.spec
@@ -16,27 +16,34 @@
#
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define psuffix -test
+%bcond_without test
+%else
+%define psuffix %{nil}
+%bcond_with test
+%endif
+
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define doc_ver 5.7.6
%define skip_python2 1
-Name: python-notebook
-Version: 6.0.2
+Name: python-notebook%{psuffix}
+Version: 6.0.3
Release: 0
Summary: Jupyter Notebook interface
License: BSD-3-Clause
Group: Development/Languages/Python
URL: https://github.com/jupyter/notebook
Source0: https://files.pythonhosted.org/packages/source/n/notebook/notebook-%{version}.tar.gz
-Source1: https://media.readthedocs.org/pdf/jupyter-notebook/%{doc_ver}/jupyter-notebook.pdf
-Source2: https://media.readthedocs.org/htmlzip/jupyter-notebook/%{doc_ver}/jupyter-notebook.zip
Source100: python-notebook-rpmlintrc
BuildRequires: %{python_module jupyter-core >= 4.4.0}
BuildRequires: %{python_module setuptools}
+BuildRequires: python-rpm-macros
+%if !%{with test}
BuildRequires: fdupes
BuildRequires: hicolor-icon-theme
BuildRequires: jupyter-notebook-filesystem
-BuildRequires: python-rpm-macros
-BuildRequires: unzip
+%endif
Requires: jupyter-notebook = %{version}
Requires: python-Jinja2
Requires: python-Send2Trash
@@ -56,7 +63,7 @@ Suggests: %{name}-latex
Provides: python-jupyter_notebook = %{version}
Obsoletes: python-jupyter_notebook < %{version}
BuildArch: noarch
-# SECTION test requirements
+%if %{with test}
BuildRequires: %{python_module Jinja2}
BuildRequires: %{python_module attrs >= 17.4.0}
BuildRequires: %{python_module Send2Trash}
@@ -77,7 +84,7 @@ BuildRequires: %{python_module terminado >= 0.8.1}
BuildRequires: %{python_module tornado >= 5}
BuildRequires: %{python_module traitlets >= 4.2.1}
BuildRequires: pandoc
-# /SECTION
+%endif
%python_subpackages
%description
@@ -112,6 +119,8 @@ Requires: jupyter-nbformat
Requires: jupyter-notebook-filesystem
Requires: python3-notebook = %{version}
Conflicts: python3-jupyter_notebook < 5.7.8
+Provides: jupyter-notebook-doc = %{version}
+Obsoletes: jupyter-notebook-doc < %{version}
%description -n jupyter-notebook
The Jupyter HTML notebook is a web-based notebook environment for
@@ -146,27 +155,14 @@ interactive computing.
This package pulls in the LaTeX dependencies for the Jupyter Notebook.
-%package -n jupyter-notebook-doc
-Summary: Documentation for Jupyter's notebook
-Group: Documentation/Other
-Provides: %{python_module jupyter_notebook-doc = %{version}}
-Provides: %{python_module notebook-doc = %{version}}
-Obsoletes: %{python_module jupyter_notebook-doc < %{version}}
-
-%description -n jupyter-notebook-doc
-Documentation and help files for Jupyter's notebook.
-
%prep
%setup -q -n notebook-%{version}
-unzip %{SOURCE2} -d docs
-mv docs/jupyter-notebook-* docs/html
-rm docs/html/.buildinfo
-%fdupes docs/html/
%build
%python_build
%install
+%if !%{with test}
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
@@ -178,18 +174,15 @@ for x in 16 24 32 48 64 128 256 512 ; do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps/
cp docs/resources/ipynb.iconset/icon_${x}x${x}.png %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps/JupyterNotebook.png
done
+%endif
-mkdir -p %{buildroot}%{_docdir}/jupyter-notebook/
-
-cp -r %{SOURCE1} %{buildroot}%{_docdir}/jupyter-notebook/
-cp -r docs/html %{buildroot}%{_docdir}/jupyter-notebook/
-
-%fdupes %{buildroot}%{_docdir}/jupyter-notebook/html/
-
+%if %{with test}
%check
export LANG=en_US.UTF-8
%python_expand nosetests-%{$python_bin_suffix} -v --exclude-dir notebook/tests/selenium
+%endif
+%if !%{with test}
%files %{python_files}
%doc README.md
%license LICENSE
@@ -215,11 +208,6 @@ export LANG=en_US.UTF-8
%files -n jupyter-notebook-latex
%license LICENSE
-
-%files -n jupyter-notebook-doc
-%license LICENSE
-%dir %{_docdir}/jupyter-notebook/
-%{_docdir}/jupyter-notebook/jupyter-notebook.pdf
-%{_docdir}/jupyter-notebook/html/
+%endif
%changelog