From efae107de73e11435b68c8c112314a436e5c36ef5e79962552f1a51b2593cd8c Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 23 May 2012 13:00:54 +0000 Subject: [PATCH 1/2] - Update to version 1.1.13: * PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII characters correctly. * PR#37: Allow configuring sphinx-apidoc via ``SPHINX_APIDOC_OPTIONS``. * PR#34: Restore Python 2.4 compatibility. * PR#36: Make the "bibliography to TOC" fix in LaTeX output specific to the document class. * #695: When the highlight language "python" is specified explicitly, do not try to parse the code to recognize non-Python snippets. * #859: Fix exception under certain circumstances when not finding appropriate objects to link to. * #860: Do not crash when encountering invalid doctest examples, just emit a warning. * #864: Fix crash with some settings of :confval:`modindex_common_prefix`. * #862: Fix handling of ``-D`` and ``-A`` options on Python 3. * #851: Recognize and warn about circular toctrees, instead of running into recursion errors. * #853: Restore compatibility with docutils trunk. * #852: Fix HtmlHelp index entry links again. * #854: Fix inheritance_diagram raising attribute errors on builtins. * #832: Fix crashes when putting comments or lone terms in a glossary. * #834, #818: Fix HTML help language/encoding mapping for all Sphinx supported languages. * #844: Fix crashes when dealing with Unicode output in doctest extension. * #831: Provide ``--project`` flag in setup_command as advertised. * #875: Fix reading config files under Python 3. * #876: Fix quickstart test under Python 3. * #870: Fix spurious KeyErrors when removing documents. * #892: Fix single-HTML builder misbehaving with the master document in a subdirectory. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=13 --- Sphinx-1.1.2.tar.gz | 3 --- Sphinx-1.1.3.tar.gz | 3 +++ python-Sphinx.changes | 36 ++++++++++++++++++++++++++++++++++++ python-Sphinx.spec | 11 +++++------ 4 files changed, 44 insertions(+), 9 deletions(-) delete mode 100644 Sphinx-1.1.2.tar.gz create mode 100644 Sphinx-1.1.3.tar.gz diff --git a/Sphinx-1.1.2.tar.gz b/Sphinx-1.1.2.tar.gz deleted file mode 100644 index 78eb43b..0000000 --- a/Sphinx-1.1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf66ee61eef61b7c478907282bddcdd5e04eebd69a00a2bb93881427938fe688 -size 2624636 diff --git a/Sphinx-1.1.3.tar.gz b/Sphinx-1.1.3.tar.gz new file mode 100644 index 0000000..4b2ca57 --- /dev/null +++ b/Sphinx-1.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9 +size 2632059 diff --git a/python-Sphinx.changes b/python-Sphinx.changes index a6b0d22..47dfaaa 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Wed May 23 12:59:54 UTC 2012 - saschpe@suse.de + +- Update to version 1.1.13: + * PR#40: Fix ``safe_repr`` function to decode bytestrings with non-ASCII + characters correctly. + * PR#37: Allow configuring sphinx-apidoc via ``SPHINX_APIDOC_OPTIONS``. + * PR#34: Restore Python 2.4 compatibility. + * PR#36: Make the "bibliography to TOC" fix in LaTeX output specific to + the document class. + * #695: When the highlight language "python" is specified explicitly, + do not try to parse the code to recognize non-Python snippets. + * #859: Fix exception under certain circumstances when not finding + appropriate objects to link to. + * #860: Do not crash when encountering invalid doctest examples, just + emit a warning. + * #864: Fix crash with some settings of :confval:`modindex_common_prefix`. + * #862: Fix handling of ``-D`` and ``-A`` options on Python 3. + * #851: Recognize and warn about circular toctrees, instead of running + into recursion errors. + * #853: Restore compatibility with docutils trunk. + * #852: Fix HtmlHelp index entry links again. + * #854: Fix inheritance_diagram raising attribute errors on builtins. + * #832: Fix crashes when putting comments or lone terms in a glossary. + * #834, #818: Fix HTML help language/encoding mapping for all Sphinx + supported languages. + * #844: Fix crashes when dealing with Unicode output in doctest extension. + * #831: Provide ``--project`` flag in setup_command as advertised. + * #875: Fix reading config files under Python 3. + * #876: Fix quickstart test under Python 3. + * #870: Fix spurious KeyErrors when removing documents. + * #892: Fix single-HTML builder misbehaving with the master document in a + subdirectory. + * #873: Fix assertion errors with empty ``only`` directives. + * #816: Fix encoding issues in the Qt help builder. + ------------------------------------------------------------------- Thu Nov 10 11:05:21 UTC 2011 - saschpe@suse.de diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 84a2bb1..9f402fb 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -1,7 +1,7 @@ # # spec file for package python-Sphinx # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products 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,9 +16,8 @@ # - Name: python-Sphinx -Version: 1.1.2 +Version: 1.1.3 Release: 0 Url: http://sphinx.pocoo.org Summary: Python documentation generator @@ -26,14 +25,14 @@ License: BSD-2-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python-docutils +BuildRequires: python-Jinja2 BuildRequires: python-devel BuildRequires: python-distribute -BuildRequires: python-Jinja2 -Requires: python-docutils +BuildRequires: python-docutils Requires: python-Jinja2 Requires: python-Pygments Requires: python-distribute +Requires: python-docutils %if 0%{?suse_version} Suggests: python-rst2pdf %py_requires From 2a0d246f6818f751bffa1a246be0947b9187f8fb1ccd9c750b065bddd7cba71c Mon Sep 17 00:00:00 2001 From: Todd R Date: Fri, 25 May 2012 07:03:32 +0000 Subject: [PATCH 2/2] Accepting request 122103 from home:HighwayStar:branches:devel:languages:python python3 package added OBS-URL: https://build.opensuse.org/request/show/122103 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=14 --- python-Sphinx.changes | 5 ++ python3-Sphinx-docs.patch | 12 ++++ python3-Sphinx.changes | 5 ++ python3-Sphinx.spec | 122 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+) create mode 100644 python3-Sphinx-docs.patch create mode 100644 python3-Sphinx.changes create mode 100644 python3-Sphinx.spec diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 47dfaaa..59df7f0 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 23 16:02:17 UTC 2012 - highwaystar.ru@gmail.com + +- python3 package added + ------------------------------------------------------------------- Wed May 23 12:59:54 UTC 2012 - saschpe@suse.de diff --git a/python3-Sphinx-docs.patch b/python3-Sphinx-docs.patch new file mode 100644 index 0000000..0d71afc --- /dev/null +++ b/python3-Sphinx-docs.patch @@ -0,0 +1,12 @@ +diff -ruN ./sphinx/domains/cpp.py ../Sphinx-1.1.3.p3k/sphinx/domains/cpp.py +--- ./sphinx/domains/cpp.py 2012-01-29 17:49:09.000000000 +0900 ++++ ../Sphinx-1.1.3.p3k/sphinx/domains/cpp.py 2012-05-24 00:41:06.524526456 +0900 +@@ -162,7 +162,7 @@ + raise NotImplementedError() + + def __str__(self): +- return unicode(self).encode('utf-8') ++ return self.__unicode__() + + def __unicode__(self): + raise NotImplementedError() diff --git a/python3-Sphinx.changes b/python3-Sphinx.changes new file mode 100644 index 0000000..d3f1264 --- /dev/null +++ b/python3-Sphinx.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Wed May 23 16:02:39 UTC 2012 - highwaystar.ru@gmail.com + +- python3-Sphinx package added + diff --git a/python3-Sphinx.spec b/python3-Sphinx.spec new file mode 100644 index 0000000..74ecd8a --- /dev/null +++ b/python3-Sphinx.spec @@ -0,0 +1,122 @@ +# +# spec file for package python3-Sphinx +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +Name: python3-Sphinx +Version: 1.1.3 +Release: 0 +Url: http://sphinx.pocoo.org +Summary: Python documentation generator +License: BSD-2-Clause +Group: Development/Languages/Python +Source: http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz +Patch0: python3-Sphinx-docs.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python3-Jinja2 +BuildRequires: python3-devel +BuildRequires: python3-2to3 +BuildRequires: python3-distribute +BuildRequires: python3-docutils +Requires: python3-Jinja2 +Requires: python3-Pygments +Requires: python3-distribute +Requires: python3-docutils +%if 0%{?suse_version} +Suggests: python3-rst2pdf +%if 0%{?suse_version} > 1010 +BuildRequires: fdupes +%endif +%endif + +%if 0%{?suse_version} && 0%{?suse_version} <= 1140 +%{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?py3_ver: %global py3_ver %(python3 -c "import sys; version=str(sys.version_info[0]) + '.' + str(sys.version_info[1]); print(version)" 2>/dev/null || echo PYTHON-NOT-FOUND)} +%endif +Requires: python(abi) = %{py3_ver} +%if 0%{?suse_version} && 0%{?suse_version} > 1140 +BuildRequires: python3-base +%endif + +%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildArchitectures: noarch +%endif + +%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 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. + +%package doc +Summary: Documentation for %{name} +Group: Documentation/Other +Requires: %{name} = %{version} + +%description doc +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. + +%prep +%setup -q -n Sphinx-%{version} +%patch0 +sed -i '1d' sphinx/pycode/pgen2/token.py # Remove she-bang line + +%build +2to3 . -w --nobackups +python3 setup.py build +sed -i 's/python/python3/g' doc/Makefile +cd doc && make html +rm _build/html/.buildinfo +mv _build/html .. +rm -rf _* + +%install +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} +for i in %{buildroot}%{_bindir}/*; do + mv "$i" "${i}-python%{py3_ver}" +done +%if 0%{?suse_version} > 1010 +%fdupes %{buildroot}%{_prefix} +%endif +%find_lang sphinx + +%files -f sphinx.lang +%defattr(-,root,root,-) +%doc AUTHORS CHANGES LICENSE README TODO +%{_bindir}/sphinx-*-python%{py3_ver} +%{python3_sitelib}/sphinx/ +%{python3_sitelib}/Sphinx-%{version}-py%{py3_ver}.egg-info + +%files doc +%defattr(-,root,root,-) +%doc EXAMPLES html + +%changelog