From c2b054a3ef27d7d550bf4a38d2e01ace335fafddafb69eb90b1cf209c21aa089 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Tue, 12 Sep 2017 15:25:47 +0000 Subject: [PATCH 1/2] Accepting request 523341 from home:jengelh:branches:devel:languages:python - Trim package descriptions for size. OBS-URL: https://build.opensuse.org/request/show/523341 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=91 --- python-Sphinx-doc.changes | 5 +++ python-Sphinx-doc.spec | 66 +++++++++++++-------------------------- python-Sphinx.changes | 5 +++ python-Sphinx.spec | 29 ++++++----------- 4 files changed, 42 insertions(+), 63 deletions(-) diff --git a/python-Sphinx-doc.changes b/python-Sphinx-doc.changes index 1365757..ee381ad 100644 --- a/python-Sphinx-doc.changes +++ b/python-Sphinx-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 11 17:07:40 UTC 2017 - jengelh@inai.de + +- Trim package descriptions for size. + ------------------------------------------------------------------- Thu Aug 24 16:43:14 UTC 2017 - toddrme2178@gmail.com diff --git a/python-Sphinx-doc.spec b/python-Sphinx-doc.spec index 8ac83dd..e276c1c 100644 --- a/python-Sphinx-doc.spec +++ b/python-Sphinx-doc.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?suse_version} != 1315 %bcond_without latex %else @@ -44,40 +45,31 @@ BuildArch: noarch %python_subpackages %description -Sphinx is a tool that makes it easy to create intelligent and beautiful -documentation for Python projects (or other documents consisting of multiple -reStructuredText sources), written by Georg Brandl. It was originally created -for the new Python documentation, and has excellent facilities for Python -project documentation, but C/C++ is supported as well, and more languages are -planned. +Sphinx is a tool that facilitates creating documentation for Python +projects (or other documents consisting of multiple reStructuredText +sources). It was originally created for the Python documentation, and +supports Python project documentation well, but C/C++ is likewise +supported. -Sphinx uses reStructuredText as its markup language, and many of its strengths -come from the power and straightforwardness of reStructuredText and its parsing -and translating suite, the Docutils. +Sphinx uses reStructuredText as its markup language. Sphinx draws from +the parsing and translating suite, the Docutils. -This package contained the documentation for Sphinx. +This package contains the documentation for Sphinx. %package man Summary: Man files for python-Sphinx Group: Documentation/Man -Requires: python-Sphinx = %{version} Requires: %{name}-man-common = %{version} +Requires: python-Sphinx = %{version} Requires(post): update-alternatives Requires(postun): update-alternatives %description man -Sphinx is a tool that makes it easy to create intelligent and beautiful -documentation for Python projects (or other documents consisting of multiple -reStructuredText sources), written by Georg Brandl. It was originally created -for the new Python documentation, and has excellent facilities for Python -project documentation, but C/C++ is supported as well, and more languages are -planned. +Sphinx is a tool that facilitates creating documentation for Python +projects (or other documents consisting of multiple reStructuredText +sources). -Sphinx uses reStructuredText as its markup language, and many of its strengths -come from the power and straightforwardness of reStructuredText and its parsing -and translating suite, the Docutils. - -This package contained the manual pages for the Sphinx executables. +This package contains the manual pages for the Sphinx executables. %package -n %{name}-html Summary: HTML Documentation for python-Sphinx @@ -85,18 +77,11 @@ Group: Documentation/HTML Provides: %{python_module Sphinx-doc-html = %{version}} %description -n %{name}-html -Sphinx is a tool that makes it easy to create intelligent and beautiful -documentation for Python projects (or other documents consisting of multiple -reStructuredText sources), written by Georg Brandl. It was originally created -for the new Python documentation, and has excellent facilities for Python -project documentation, but C/C++ is supported as well, and more languages are -planned. +Sphinx is a tool that facilitates creating documentation for Python +projects (or other documents consisting of multiple reStructuredText +sources). -Sphinx uses reStructuredText as its markup language, and many of its strengths -come from the power and straightforwardness of reStructuredText and its parsing -and translating suite, the Docutils. - -This package contained the HTML documentation for Sphinx. +This package contains the HTML documentation for Sphinx. %package -n %{name}-man-common Summary: Man files for python-Sphinx - python-independent versions @@ -104,18 +89,11 @@ Group: Documentation/Man Provides: %{python_module Sphinx-doc-man-common = %{version}} %description -n %{name}-man-common -Sphinx is a tool that makes it easy to create intelligent and beautiful -documentation for Python projects (or other documents consisting of multiple -reStructuredText sources), written by Georg Brandl. It was originally created -for the new Python documentation, and has excellent facilities for Python -project documentation, but C/C++ is supported as well, and more languages are -planned. +Sphinx is a tool that facilitates creating documentation for Python +projects (or other documents consisting of multiple reStructuredText +sources). -Sphinx uses reStructuredText as its markup language, and many of its strengths -come from the power and straightforwardness of reStructuredText and its parsing -and translating suite, the Docutils. - -This package contained the python version-independent manual pages for the +This package contains the Python version-independent manual pages for the Sphinx executables. %prep diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 9b68eea..e06ad46 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 11 17:07:40 UTC 2017 - jengelh@inai.de + +- Trim package descriptions for size. + ------------------------------------------------------------------- Thu Aug 31 22:47:36 UTC 2017 - toddrme2178@gmail.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 84dd458..eb98393 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -80,16 +80,14 @@ BuildArch: noarch %python_subpackages %description -Sphinx is a tool that makes it easy to create intelligent and beautiful -documentation for Python projects (or other documents consisting of multiple -reStructuredText sources), written by Georg Brandl. It was originally created -for the new Python documentation, and has excellent facilities for Python -project documentation, but C/C++ is supported as well, and more languages are -planned. +Sphinx is a tool that facilitates creating documentation for Python +projects (or other documents consisting of multiple reStructuredText +sources). It was originally created for the Python documentation, and +supports Python project documentation well, but C/C++ is likewise +supported. -Sphinx uses reStructuredText as its markup language, and many of its strengths -come from the power and straightforwardness of reStructuredText and its parsing -and translating suite, the Docutils. +Sphinx uses reStructuredText as its markup language. Sphinx draws from +the parsing and translating suite, the Docutils. %package latex Summary: Sphinx packages for LaTeX @@ -161,16 +159,9 @@ Requires: tex(varwidth.sty) %endif %description latex -Sphinx is a tool that makes it easy to create intelligent and beautiful -documentation for Python projects (or other documents consisting of multiple -reStructuredText sources), written by Georg Brandl. It was originally created -for the new Python documentation, and has excellent facilities for Python -project documentation, but C/C++ is supported as well, and more languages are -planned. - -Sphinx uses reStructuredText as its markup language, and many of its strengths -come from the power and straightforwardness of reStructuredText and its parsing -and translating suite, the Docutils. +Sphinx is a tool that facilitates creating documentation for Python +projects (or other documents consisting of multiple reStructuredText +sources). This package contains the LaTeX components for %{name}. From a1f60844ea0240ab96f622d022f3094e4ee0d290fe7e113e576f1bd21817e14a Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 18 Sep 2017 22:31:19 +0000 Subject: [PATCH 2/2] Accepting request 527167 from home:TheBlackCat:branches:devel:languages:python - Move sphinxcontrib namespace into seperate package to avoid dependency loop with sphinxcontrib-websupport. OBS-URL: https://build.opensuse.org/request/show/527167 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=92 --- __init__.py | 2 -- python-Sphinx.changes | 6 ++++++ python-Sphinx.spec | 13 +------------ 3 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 __init__.py diff --git a/__init__.py b/__init__.py deleted file mode 100644 index 2f0b64f..0000000 --- a/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# -*- coding: utf-8 -*- -__import__('pkg_resources').declare_namespace(__name__) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index e06ad46..d8f5a39 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 18 22:03:24 UTC 2017 - toddrme2178@gmail.com + +- Move sphinxcontrib namespace into seperate package to avoid + dependency loop with sphinxcontrib-websupport. + ------------------------------------------------------------------- Mon Sep 11 17:07:40 UTC 2017 - jengelh@inai.de diff --git a/python-Sphinx.spec b/python-Sphinx.spec index eb98393..c368094 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -32,7 +32,6 @@ Summary: Python documentation generator License: BSD-2-Clause Group: Development/Languages/Python Source: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz -Source10: https://raw.githubusercontent.com/sphinx-doc/sphinxcontrib-websupport/1.0.1/sphinxcontrib/__init__.py Patch1: disable-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} @@ -49,6 +48,7 @@ Requires: python-requests >= 2.0.0 Requires: python-six >= 1.5 Requires: python-snowballstemmer >= 1.1 Requires: python-sphinx_rtd_theme +Requires: python-sphinxcontrib Requires: python-sphinxcontrib-websupport Recommends: python-SQLAlchemy >= 0.9 Recommends: python-Whoosh >= 2.0 @@ -178,13 +178,6 @@ sed -i 's/\r$//' sphinx/themes/basic/static/jquery.js # Fix wrong end-of-line en %install %python_install -# Set up the sphinxcontrib namespace package -%{python_expand mkdir -p %{buildroot}%{$python_sitelib}/sphinxcontrib/ -cp %{SOURCE10} %{buildroot}%{$python_sitelib}/sphinxcontrib/ -$python -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/sphinxcontrib/ -$python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/sphinxcontrib/ -} - %python_clone -a %{buildroot}%{_bindir}/sphinx-apidoc %python_clone -a %{buildroot}%{_bindir}/sphinx-autogen %python_clone -a %{buildroot}%{_bindir}/sphinx-build @@ -210,10 +203,6 @@ $python -O -m compileall -d %{$python_sitelib} %{buildroot}%{$python_sitelib}/sp %exclude %{python_sitelib}/sphinx/texinputs/ %endif %{python_sitelib}/Sphinx-%{version}-py*.egg-info -%dir %{python_sitelib}/sphinxcontrib/ -%{python_sitelib}/sphinxcontrib/__init__.py* -%pycache_only %dir %{python_sitelib}/sphinxcontrib/__pycache__/ -%pycache_only %{python_sitelib}/sphinxcontrib/__pycache__/__init__*.py* # Requirements are not available on SLES %if %{with latex}