Hello community,

here is the log from the commit of package python3-jupyter for openSUSE:Factory 
checked in at 2017-04-20 20:50:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-jupyter (Old)
 and      /work/SRC/openSUSE:Factory/.python3-jupyter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python3-jupyter"

Thu Apr 20 20:50:42 2017 rev:5 rq:486560 version:1.0.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/python3-jupyter/python3-jupyter.changes  
2016-05-25 21:28:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python3-jupyter.new/python3-jupyter.changes     
2017-04-20 20:51:07.494480612 +0200
@@ -1,0 +2,5 @@
+Fri Apr  7 18:22:14 UTC 2017 - [email protected]
+
+- Clean up documentation building.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python3-jupyter.spec ++++++
--- /var/tmp/diff_new_pack.Tmtf9K/_old  2017-04-20 20:51:08.150387866 +0200
+++ /var/tmp/diff_new_pack.Tmtf9K/_new  2017-04-20 20:51:08.154387300 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package python3-jupyter
 #
-# Copyright (c) 2016 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,13 +16,8 @@
 #
 
 
-%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 
1110 )
 # PDF documentation currently broken
-# %define build_pdf 1
-%define build_pdf 0
-%else
-%define build_pdf 0
-%endif
+%bcond_with pdf
 
 Name:           python3-jupyter
 Version:        1.0.0
@@ -32,6 +27,7 @@
 Group:          Development/Languages/Python
 Url:            http://jupyter.org
 Source:         
https://files.pythonhosted.org/packages/source/j/jupyter/jupyter-%{version}.tar.gz
+BuildRequires:  fdupes
 BuildRequires:  python3-devel
 BuildRequires:  python3-jupyter_console
 BuildRequires:  python3-jupyter_core
@@ -42,7 +38,7 @@
 BuildRequires:  python3-jupyter_qtconsole
 # Documentation requirements
 BuildRequires:  python3-Sphinx
-%if %{build_pdf}
+%if %{with pdf}
 BuildRequires:  python3-Sphinx-latex
 %endif
 Requires:       python3-jupyter_core
@@ -67,21 +63,18 @@
 qtconsole, and the IPython kernel.  Additional components and kernels
 can be installed separately.
 
-%package doc-html
-Summary:        HTML documentation for %{name}
-Group:          Development/Languages/Python
-Recommends:     %{name} = %{version}
-
-%description doc-html
-Documentation and help files for %{name} in HTML format
-
-%package doc-pdf
+%package doc
 Summary:        HTML documentation for %{name}
 Group:          Development/Languages/Python
 Recommends:     %{name} = %{version}
+Provides:       %{name}-doc-pdf = %{version}
+Provides:       %{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}
 
-%description doc-pdf
-Documentation and help files for %{name} in PDF format
+%description doc
+Documentation and help files for %{name}.
 
 %prep
 %setup -q -n jupyter-%{version}
@@ -89,37 +82,48 @@
 %build
 python3 setup.py build
 
-%install
-python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
-
 # Build the documentation
 pushd docs
 export JUPYTER_PATH='%{jupyter_path}'
 export PYTHONPATH=%{buildroot}%{python3_sitelib}
-%if %{build_pdf}
+%if %{with pdf}
 make latexpdf
 %endif
 make html
 rm -rf build/html/.buildinfo
 popd
+
+%install
+python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
+
+# This is provided by jupyter_core now
 rm -rf %{buildroot}%{python3_sitelib}/jupyter.py
 rm -rf %{buildroot}%{python3_sitelib}/__pycache__/jupyter.*.pyc
 
+# Install documentation
+mkdir -p %{buildroot}%{_docdir}/%{name}
+
+%if %{with pdf}
+cp docs/build/latex/*.pdf %{buildroot}%{_docdir}/%{name}/
+%endif
+
+cp -r docs/build/html %{buildroot}%{_docdir}/%{name}/
+cp LICENSE %{buildroot}%{_docdir}/%{name}/
+cp README.md %{buildroot}%{_docdir}/%{name}/
+
+%fdupes %{buildroot}%{_docdir}/%{name}/
+
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README.md
+%dir %{_docdir}/%{name}/
+%{_docdir}/%{name}/LICENSE
+%{_docdir}/%{name}/README.md
 %{python3_sitelib}/jupyter-%{version}-py*.egg-info
 
-%files doc-html
+%files doc
 %defattr(-,root,root,-)
-%doc LICENSE
-%doc docs/build/html/
-
-%if %{build_pdf}
-%files doc-pdf
-%defattr(-,root,root,-)
-%doc LICENSE
-%doc docs/build/latex/*.pdf
-%endif
+%{_docdir}/%{name}/
+%exclude %{_docdir}/%{name}/LICENSE
+%exclude %{_docdir}/%{name}/README.md
 
 %changelog


Reply via email to