Hello community, here is the log from the commit of package python-jupyter for openSUSE:Factory checked in at 2017-05-17 17:14:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jupyter (Old) and /work/SRC/openSUSE:Factory/.python-jupyter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-jupyter" Wed May 17 17:14:35 2017 rev:4 rq:491666 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jupyter/python-jupyter.changes 2015-10-28 17:30:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-jupyter.new/python-jupyter.changes 2017-05-17 17:14:37.504623523 +0200 @@ -1,0 +2,16 @@ +Wed Apr 26 21:18:33 UTC 2017 - [email protected] + +- Implement single-spec version. + +------------------------------------------------------------------- +Fri Apr 7 18:26:26 UTC 2017 - [email protected] + +- Remove jupyter.py since it is now provided by python3-jupyter_core. +- Clean up documentation building. + +------------------------------------------------------------------- +Thu Mar 16 14:31:41 UTC 2017 - [email protected] + +- do not Recommend jupyter_nbconvert (which pulls in texlive) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jupyter.spec ++++++ --- /var/tmp/diff_new_pack.bmjBuJ/_old 2017-05-17 17:14:38.216523156 +0200 +++ /var/tmp/diff_new_pack.bmjBuJ/_new 2017-05-17 17:14:38.220522592 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jupyter # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,12 @@ # +# PDF documentation currently broken +%bcond_with pdf + +%bcond_without html + +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-jupyter Version: 1.0.0 Release: 0 @@ -23,19 +29,24 @@ License: BSD-3-Clause Group: Development/Languages/Python Url: http://jupyter.org -Source: https://pypi.python.org/packages/source/j/jupyter/jupyter-%{version}.tar.gz -BuildRequires: python-devel -BuildRequires: python-jupyter_console -BuildRequires: python-jupyter_core -BuildRequires: python-jupyter_ipykernel -BuildRequires: python-jupyter_ipywidgets -BuildRequires: python-jupyter_nbconvert -BuildRequires: python-jupyter_notebook -BuildRequires: python-jupyter_qtconsole +Source: https://files.pythonhosted.org/packages/source/j/jupyter/jupyter-%{version}.tar.gz +BuildRequires: fdupes +BuildRequires: python-rpm-macros +BuildRequires: %{python_module devel} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module jupyter_console} +BuildRequires: %{python_module jupyter_core} +BuildRequires: %{python_module jupyter_ipykernel} +BuildRequires: %{python_module jupyter_ipywidgets} +BuildRequires: %{python_module jupyter_nbconvert} +BuildRequires: %{python_module jupyter_notebook} +BuildRequires: %{python_module jupyter_qtconsole} # Documentation requirements -BuildRequires: python-Sphinx -%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) -BuildRequires: python-Sphinx-latex +%if %{with pdf} || %{with html} +BuildRequires: python3-Sphinx +%endif +%if %{with pdf} +BuildRequires: python3-Sphinx-latex %endif Requires: python-jupyter_core Recommends: python-jupyter_console @@ -45,11 +56,8 @@ Recommends: python-jupyter_notebook Recommends: python-jupyter_qtconsole BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif +%python_subpackages %description Jupyter is an environment for interactive computing in multiple languages. @@ -63,56 +71,82 @@ qtconsole, and the IPython kernel. Additional components and kernels can be installed separately. -%package doc-html -Summary: HTML documentation for %{name} -Recommends: %{name} = %{version} - -%description doc-html -Documentation and help files for %{name} in HTML format - -%package doc-pdf +%package -n %{name}-doc Summary: HTML documentation for %{name} -Recommends: %{name} = %{version} +Group: Development/Languages/Python +Provides: %{name}-doc-pdf = %{version} +Provides: %{name}-doc-html = %{version} +Provides: %{python_module %{name}-doc = %{version}} +Provides: %{python_module %{name}-doc-pdf = %{version}} +Provides: %{python_module %{name}-doc-html = %{version}} +# Change from <= to < when (and if) there is a next release after 1.0.0 +Obsoletes: %{name}-doc-pdf <= %{version} +Obsoletes: %{name}-doc-html <= %{version} +Obsoletes: %{python_module %{name}-doc-pdf <= %{version}} +Obsoletes: %{python_module %{name}-doc-html <= %{version}} -%description doc-pdf -Documentation and help files for %{name} in PDF format +%description -n %{name}-doc +Documentation and help files for %{name}. %prep %setup -q -n jupyter-%{version} %build -python setup.py build - -%install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%python_build # Build the documentation pushd docs export JUPYTER_PATH='%{jupyter_path}' export PYTHONPATH=%{buildroot}%{python_sitelib} -# PDF documentation currently doesn't build -# %if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) -# make latexpdf -# %endif +%if %{with pdf} +make latexpdf +%endif +%if %{with html} make html +%endif rm -rf build/html/.buildinfo popd -%files +%install +%python_install + +# This is provided by jupyter_core now +%python_expand rm -f %{buildroot}%{$python_sitelib}/jupyter.py* +%python_expand rm -rf %{buildroot}%{$python_sitelib}/__pycache__/ + +# Install documentation +mkdir -p %{buildroot}%{_docdir}/%{name} + +%if %{with pdf} +cp docs/build/latex/*.pdf %{buildroot}%{_docdir}/%{name}/ +%endif + +%if %{with html} +cp -r docs/build/html %{buildroot}%{_docdir}/%{name}/ +%endif + +%fdupes %{buildroot}%{_docdir}/%{name}/ + +%files %{python_files} %defattr(-,root,root,-) %doc LICENSE README.md -%{python_sitelib}/* +%{python_sitelib}/jupyter-%{version}-py*.egg-info +%if %{with html} +%exclude %{_docdir}/%{name}/html/ +%endif +%if %{with pdf} +%exclude %{_docdir}/%{name}/*.pdf +%endif -%files doc-html +%files -n %{name}-doc %defattr(-,root,root,-) -%doc LICENSE -%doc docs/build/html/ - -# if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) -# %files doc-pdf -# %defattr(-,root,root,-) -# %doc LICENSE -# oc docs/build/latex/*.pdf -# %endif +%doc LICENSE README.md +%dir %{_docdir}/%{name}/ +%if %{with html} +%{_docdir}/%{name}/html/ +%endif +%if %{with pdf} +%{_docdir}/%{name}/*.pdf +%endif %changelog
