Hello community, here is the log from the commit of package python-jupyter_core for openSUSE:Factory checked in at 2019-05-22 11:05:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jupyter_core (Old) and /work/SRC/openSUSE:Factory/.python-jupyter_core.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jupyter_core" Wed May 22 11:05:14 2019 rev:8 rq:698303 version:4.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-jupyter_core/python-jupyter_core-doc.changes 2018-02-21 14:12:56.711005162 +0100 +++ /work/SRC/openSUSE:Factory/.python-jupyter_core.new.5148/python-jupyter_core-doc.changes 2019-05-22 11:05:25.558577323 +0200 @@ -1,0 +2,7 @@ +Thu Apr 25 01:58:55 UTC 2019 - Todd R <toddrme2178@gmail.com> + +- Split out jupyter components into subpackage. +- Add rpm macros. +- Rename doc package to match jupyter package. + +------------------------------------------------------------------- python-jupyter_core.changes: same change New: ---- jupyter-core.pdf jupyter-core.zip macros.jupyter ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jupyter_core-doc.spec ++++++ --- /var/tmp/diff_new_pack.n9zpWB/_old 2019-05-22 11:05:26.158577453 +0200 +++ /var/tmp/diff_new_pack.n9zpWB/_new 2019-05-22 11:05:26.158577453 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jupyter_core-doc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,106 +12,96 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%if 0%{?suse_version} && 0%{?suse_version} > 1320 -%bcond_without pdf -%else -%bcond_with pdf -%endif - -%bcond_without html - -%bcond_without tests - %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%bcond_without tests Name: python-jupyter_core-doc Version: 4.4.0 Release: 0 -Summary: Documentation for python-jupyter_core +Summary: Documentation for the Jupyter base package License: BSD-3-Clause -Group: Development/Languages/Python -Url: https://github.com/jupyter/jupyter_core -Source: https://files.pythonhosted.org/packages/source/j/jupyter_core/jupyter_core-%{version}.tar.gz +Group: Documentation/Other +URL: https://github.com/jupyter/jupyter_core +Source0: https://files.pythonhosted.org/packages/source/j/jupyter_core/jupyter_core-%{version}.tar.gz +Source1: https://buildmedia.readthedocs.org/media/pdf/jupyter-core/stable/jupyter-cor... +Source2: https://buildmedia.readthedocs.org/media/htmlzip/jupyter-core/stable/jupyter... # PATCH-FIX-OPENSUSE -- use_rpms_paths.patch -- change paths so they are easy to replace at build time Patch0: use_rpms_paths.patch BuildRequires: %{python_module jupyter_core} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: unzip +BuildArch: noarch %if %{with tests} # Test requirements BuildRequires: %{python_module pytest} # Python 2.7 test requirements BuildRequires: python-mock %endif -# Documentation requirements -BuildRequires: %{python_module sphinxcontrib-github-alt} -%if %{with pdf} || %{with html} -BuildRequires: python3-Sphinx -%endif -%if %{with pdf} -BuildRequires: python3-Sphinx-latex -%endif -Provides: %{name}-html = %{version} -Provides: %{name}-pdf = %{version} -Obsoletes: %{name}-html < %{version} -Obsoletes: %{name}-pdf < %{version} -Provides: %{python_module jupyter_core-doc = %{version}} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %description -Documentation and help files for python-jupyter_core. +Documentation and help files for the Jupyter base package. + +%package -n jupyter-jupyter_core-doc +Summary: Documentation for the Jupyter base package +Group: Documentation/Other +Provides: python-jupyter_core-doc = %{version} +Obsoletes: python-jupyter_core-doc <= %{version} +Provides: python-jupyter_core-html = %{version} +Provides: python-jupyter_core-pdf = %{version} +Obsoletes: python-jupyter_core-html < %{version} +Obsoletes: python-jupyter_core-pdf < %{version} +Provides: %{python_module jupyter_core-doc = %{version}} +Obsoletes: %{python_module jupyter_core-doc <= %{version}} +Provides: %{python_module jupyter_core-doc-pdf = %{version}} +Obsoletes: %{python_module jupyter_core-doc-pdf <= %{version}} +Provides: %{python_module jupyter_core-doc-html = %{version}} +Obsoletes: %{python_module jupyter_core-doc-html <= %{version}} + +%description -n jupyter-jupyter_core-doc +Documentation and help files for the Jupyter base package. %prep %setup -q -n jupyter_core-%{version} %patch0 -p1 +unzip %{SOURCE2} -d docs +mv docs/jupyter-core-* docs/html +rm docs/html/.buildinfo + +echo %{_jupyter_prefix} +echo %{_jupyter_confdir} + # Set the appropriate paths dynamically -sed -i "s|\"/usr/share/jupyter\"|\"%{_datadir}/jupyter\"|" jupyter_core/paths.py -sed -i "s|\"/etc/jupyter\"|\"%{_sysconfdir}/jupyter\"|" jupyter_core/paths.py +sed -i "s|\"%{_datadir}/jupyter\"|\"%{_datadir}/jupyter\"|" jupyter_core/paths.py +sed -i "s|\"%{_sysconfdir}/jupyter\"|\"%{_sysconfdir}/jupyter\"|" jupyter_core/paths.py sed -i "s|(sys\.prefix, 'share', 'jupyter')|('%{_datadir}', 'jupyter')|" jupyter_core/paths.py sed -i "s|(sys\.prefix, 'etc', 'jupyter')|('%{_sysconfdir}', 'jupyter')|" jupyter_core/paths.py %build -# Build the documentation -pushd docs -%if %{with html} -make html -rm -rf build/html/.buildinfo -%endif -%if %{with pdf} -make latexpdf -%endif -popd +# Not needed %install -mkdir -p %{buildroot}%{_docdir}/python-jupyter_core +mkdir -p %{buildroot}%{_docdir}/jupyter-jupyter_core/ -%if %{with pdf} -cp docs/_build/latex/*.pdf %{buildroot}%{_docdir}/python-jupyter_core/ -%endif - -%if %{with html} -cp -r docs/_build/html %{buildroot}%{_docdir}/python-jupyter_core/ -%endif +cp %{SOURCE1} %{buildroot}%{_docdir}/jupyter-jupyter_core/ +cp -r docs/html %{buildroot}%{_docdir}/jupyter-jupyter_core/ -cp -r examples %{buildroot}%{_docdir}/python-jupyter_core/ -%fdupes %{buildroot}%{_docdir}/python-jupyter_core/ +%fdupes %{buildroot}%{_docdir}/jupyter-jupyter_core/ %if %{with tests} %check # test_migrate requires files not found in the package pushd jupyter_core/tests rm test_migrate.py -%python_expand py.test-%{$python_bin_suffix} +%pytest popd %endif -%files -%defattr(-,root,root,-) -%doc COPYING.md -%{_docdir}/python-jupyter_core/ +%files -n jupyter-jupyter_core-doc +%license COPYING.md +%{_docdir}/jupyter-jupyter_core/ %changelog ++++++ python-jupyter_core.spec ++++++ --- /var/tmp/diff_new_pack.n9zpWB/_old 2019-05-22 11:05:26.174577456 +0200 +++ /var/tmp/diff_new_pack.n9zpWB/_new 2019-05-22 11:05:26.178577457 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jupyter_core # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,20 +23,20 @@ Summary: Base package on which Jupyter projects rely License: BSD-3-Clause Group: Development/Languages/Python -Url: https://github.com/jupyter/jupyter_core -Source: https://files.pythonhosted.org/packages/source/j/jupyter_core/jupyter_core-%{version}.tar.gz +URL: https://github.com/jupyter/jupyter_core +Source0: https://files.pythonhosted.org/packages/source/j/jupyter_core/jupyter_core-%{version}.tar.gz +Source10: macros.jupyter # PATCH-FIX-OPENSUSE -- use_rpms_paths.patch -- change paths so they are easy to replace at build time Patch0: use_rpms_paths.patch -BuildRequires: %{python_module devel} BuildRequires: %{python_module ipython_genutils} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module traitlets} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: jupyter-jupyter_core = %{version} Requires: python-ipython_genutils Requires: python-traitlets -Recommends: python-jupyter_ipython -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: python-ipython BuildArch: noarch %python_subpackages @@ -49,12 +49,30 @@ There is no reason to install this package on its own. It will be pulled in as a dependency by packages that require it. +This package provides the python interface. + +%package -n jupyter-jupyter_core +Summary: Base package on which Jupyter projects rely +Group: Development/Languages/Python +Requires: python3-jupyter_core = %{version} + +%description -n jupyter-jupyter_core +Core common functionality of Jupyter projects. + +This package contains base application classes and configuration inherited by +other projects. It doesn't do much on its own. + +There is no reason to install this package on its own. It will be pulled in +as a dependency by packages that require it. + +This package provides the jupyter components. + %prep %setup -q -n jupyter_core-%{version} %patch0 -p1 # Set the appropriate paths dynamically -sed -i "s|\"/usr/share/jupyter\"|\"%{_datadir}/jupyter\"|" jupyter_core/paths.py -sed -i "s|\"/etc/jupyter\"|\"%{_sysconfdir}/jupyter\"|" jupyter_core/paths.py +sed -i "s|\"%{_datadir}/jupyter\"|\"%{_datadir}/jupyter\"|" jupyter_core/paths.py +sed -i "s|\"%{_sysconfdir}/jupyter\"|\"%{_sysconfdir}/jupyter\"|" jupyter_core/paths.py sed -i "s|(sys\.prefix, 'share', 'jupyter')|('%{_datadir}', 'jupyter')|" jupyter_core/paths.py sed -i "s|(sys\.prefix, 'etc', 'jupyter')|('%{_sysconfdir}', 'jupyter')|" jupyter_core/paths.py @@ -65,7 +83,7 @@ %python_install %{python_expand chmod a+x %{buildroot}%{$python_sitelib}/jupyter_core/troubleshoot.py -sed -i "s|^#!/usr/bin/env python$|#!%{__$python}|" %{buildroot}%{$python_sitelib}/jupyter_core/troubleshoot.py +sed -i "s|^#!%{_bindir}/env python$|#!%{__$python}|" %{buildroot}%{$python_sitelib}/jupyter_core/troubleshoot.py $python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jupyter_core/ $python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/jupyter_core/ %fdupes %{buildroot}%{$python_sitelib} @@ -76,17 +94,23 @@ mkdir -p %{buildroot}%{_datadir}/jupyter/kernels/ mkdir -p %{buildroot}%{_sysconfdir}/jupyter/ +install -D -m644 %{SOURCE10} %{buildroot}%{_rpmconfigdir}/macros.d/macros.jupyter + %files %{python_files} -%defattr(-,root,root,-) -%doc CONTRIBUTING.md COPYING.md README.md -%python3_only %{_bindir}/jupyter -%python3_only %{_bindir}/jupyter-migrate -%{python_sitelib}/jupyter*.py* -%pycache_only %{python_sitelib}/__pycache__/jupyter*.*.py* -%{_datadir}/jupyter/ -%{_datadir}/jupyter/kernels/ -%{_sysconfdir}/jupyter/ +%license COPYING.md +%{python_sitelib}/jupyter.py* +%pycache_only %{python_sitelib}/__pycache__/jupyter.*.py* %{python_sitelib}/jupyter_core/ %{python_sitelib}/jupyter_core-%{version}-*.egg-info +%files -n jupyter-jupyter_core +%license COPYING.md +%doc CONTRIBUTING.md README.md +%{_bindir}/jupyter +%{_bindir}/jupyter-migrate +%{_rpmconfigdir}/macros.d/macros.jupyter +%dir %{_datadir}/jupyter/ +%dir %{_datadir}/jupyter/kernels/ +%dir %{_sysconfdir}/jupyter/ + %changelog ++++++ macros.jupyter ++++++ %_jupyter_prefix %{_datadir}/jupyter/ %_jupyter_kernel_dir %{_jupyter_prefix}/kernels/ %_jupyter_confdir %{_sysconfdir}/jupyter/ %jupyter_move_config \ %if "$(dirname %{_prefix}/etc/jupyter)" != "$(dirname %{_jupyter_confdir})" \ mkdir -p %{buildroot}%{_sysconfdir} \ mv %{buildroot}%{_prefix}/etc/jupyter %{buildroot}%{_jupyter_confdir} \ rm -d %{buildroot}%{_prefix}/etc \ %endif \ %{nil}