Accepting request 205956 from devel:languages:python

- Updateo version 1.2b3:
  + The Sphinx error log files will now include a list of the loaded extensions
    for help in debugging.
  + PR#154: Remove "sphinx" prefix from LaTeX class name except 'sphinxmanual'
    and 'sphinxhowto'. Now you can use your custom document class without
    'sphinx' prefix. Thanks to Erik B.
  + #1265: Fix i18n: crash when translating a section name that is pointed to from
    a named target.
  + A wrong condition broke the search feature on first page that is usually
    index.rst.  This issue was introduced in 1.2b1.
  + #703: When Sphinx can't decode filenames with non-ASCII characters, Sphinx now
    catches UnicodeError and will continue if possible instead of raising the
    exception.
- Changes from version 1.2b2 and prior:
  + See CHANGES file
- Own /etc/alternatives/sphinx-* by ghosting (update-alternatives)
- Dropped sphinx-docutils-0.10.patch (merged upstream)
  

  * PR#40: Fix safe_repr function to decode bytestrings with non-ASCII
  * PR#37: Allow configuring sphinx-apidoc via SPHINX_APIDOC_OPTIONS.
  * #864: Fix crash with some settings of :confval:modindex_common_prefix.
  * #862: Fix handling of -D and -A options on Python 3.
  * #831: Provide --project flag in setup_command as advertised.
  * #873: Fix assertion errors with empty only directives.
  * #805: Make the Sphinx.add_index_to_domain method work correctly.
  * #599: Import PIL as from PIL import Image.
  * #571: Implement ~ cross-reference prefix for the C domain.
  * Fix traceback with only directives preceded by targets.
  * Fix JavaScript domain links to objects with $ in their name.

OBS-URL: https://build.opensuse.org/request/show/205956
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Sphinx?expand=0&rev=24

Sphinx-1.1.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9
-size 2632059

Sphinx-1.2b3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c1013bd85641cc1dd91944e3ad2c9d2fc78acc11daea2212b041e0e31f4ddc4
+size 3125701

python-Sphinx.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Nov  6 08:10:01 UTC 2013 - speilicke@suse.com
+
+- Updateo version 1.2b3:
+  + The Sphinx error log files will now include a list of the loaded extensions
+    for help in debugging.
+  + PR#154: Remove "sphinx" prefix from LaTeX class name except 'sphinxmanual'
+    and 'sphinxhowto'. Now you can use your custom document class without
+    'sphinx' prefix. Thanks to Erik B.
+  + #1265: Fix i18n: crash when translating a section name that is pointed to from
+    a named target.
+  + A wrong condition broke the search feature on first page that is usually
+    index.rst.  This issue was introduced in 1.2b1.
+  + #703: When Sphinx can't decode filenames with non-ASCII characters, Sphinx now
+    catches UnicodeError and will continue if possible instead of raising the
+    exception.
+- Changes from version 1.2b2 and prior:
+  + See CHANGES file
+- Own /etc/alternatives/sphinx-* by ghosting (update-alternatives)
+- Dropped sphinx-docutils-0.10.patch (merged upstream)
+  
 -------------------------------------------------------------------
 Thu Oct 24 11:14:54 UTC 2013 - speilicke@suse.com
 
@@ -50,9 +71,9 @@ Wed May 23 16:02:17 UTC 2012 - highwaystar.ru@gmail.com
 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
+  * 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#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.
@@ -62,8 +83,8 @@ Wed May 23 12:59:54 UTC 2012 - saschpe@suse.de
     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`.
+  * #864: Fix crash with some settings of :confval:modindex_common_prefix.
-  * #862: Fix handling of ``-D`` and ``-A`` options on Python 3.
+  * #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.
@@ -73,13 +94,13 @@ Wed May 23 12:59:54 UTC 2012 - saschpe@suse.de
   * #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.
+  * #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.
+  * #873: Fix assertion errors with empty only directives.
   * #816: Fix encoding issues in the Qt help builder.
 
 -------------------------------------------------------------------
@@ -92,7 +113,7 @@ Thu Nov 10 11:05:21 UTC 2011 - saschpe@suse.de
   * #792: Include "sphinx-apidoc" in the source distribution.
   * #797: Don't crash on a misformatted glossary.
   * #801: Make intersphinx work properly without SSL support.
-  * #805: Make the ``Sphinx.add_index_to_domain`` method work correctly.
+  * #805: Make the Sphinx.add_index_to_domain method work correctly.
   * #780: Fix Python 2.5 compatibility.
 
 -------------------------------------------------------------------
@@ -120,7 +141,7 @@ Sun Jul  3 11:31:27 UTC 2011 - saschpe@gmx.de
 - Update to version 1.0.7:
   * #347: Fix wrong generation of directives of static methods in
     autosummary.
-  * #599: Import PIL as ``from PIL import Image``.
+  * #599: Import PIL as from PIL import Image.
   * #558: Fix longtables with captions in LaTeX output.
   * Make token references work as hyperlinks again in LaTeX output.
   * #572: Show warnings by default when reference labels cannot be
@@ -141,13 +162,13 @@ Sun Jul  3 11:31:27 UTC 2011 - saschpe@gmx.de
     of the import error.
   * Fix a bug where the removal of download files and images wasn't
     noticed.
-  * #571: Implement ``~`` cross-reference prefix for the C domain.
+  * #571: Implement ~ cross-reference prefix for the C domain.
   * Fix regression of LaTeX output with the fix of #556.
   * #568: Fix lookup of class attribute documentation on descriptors
     so that comment documentation now works.
-  * Fix traceback with ``only`` directives preceded by targets.
+  * Fix traceback with only directives preceded by targets.
   * Fix tracebacks occurring for duplicate C++ domain objects.
-  * Fix JavaScript domain links to objects with ``$`` in their name.
+  * Fix JavaScript domain links to objects with $ in their name.
 - Spec file cleanup:
   * Use fdupes and %find_lang
   * Removed authors from description

python-Sphinx.spec

@@ -17,28 +17,27 @@
 
 
 Name:           python-Sphinx
-Version:        1.1.3
+Version:        1.2b3
 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:         sphinx-docutils-0.10.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 # Documentation requirements:
-BuildRequires:  python-Jinja2
+BuildRequires:  python-Jinja2 >= 2.3
-BuildRequires:  python-docutils
+BuildRequires:  python-docutils >= 0.7
 # Testsuite requirements:
-BuildRequires:  python-Pygments
+BuildRequires:  python-Pygments >= 1.2
 BuildRequires:  python-nose
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-Requires:       python-Jinja2
+Requires:       python-Jinja2 >= 2.3
-Requires:       python-Pygments
+Requires:       python-Pygments >= 1.2
-Requires:       python-docutils
+Requires:       python-docutils >= 0.7
 Suggests:       python-rst2pdf
 Provides:       python-sphinx = %{version}
 Obsoletes:      python-sphinx < %{version}
@@ -79,7 +78,6 @@ and translating suite, the Docutils.
 
 %prep
 %setup -q -n Sphinx-%{version}
-%patch0 -p1
 sed -i '/#\!/d' sphinx/pycode/pgen2/token.py # Fix non-excutable-script warning
 # Add Interpreter version suffix to entrypoints (and thus /usr/bin binaries) to
 # allow for update-alternatives later on:
@@ -103,7 +101,7 @@ done
 %find_lang sphinx
 
 %check
-nosetests
+PYTHONPATH=$PWD make test
 
 %pre
 # Since /usr/bin/sphinx-* became ghosted to be used with update-alternatives, we have
@@ -136,22 +134,30 @@ fi
 
 %files -f sphinx.lang
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGES LICENSE README
+%doc AUTHORS CHANGES LICENSE README.rst
-%ghost %attr(0755,root,root) %{_bindir}/sphinx-apidoc
+%ghost %{_bindir}/sphinx-apidoc
+%ghost %{_sysconfdir}/alternatives/sphinx-apidoc
 %{_bindir}/sphinx-apidoc-%{py_ver}
-%ghost %attr(0755,root,root)  %{_bindir}/sphinx-autogen
+%ghost %{_bindir}/sphinx-autogen
+%ghost %{_sysconfdir}/alternatives/sphinx-autogen
 %{_bindir}/sphinx-autogen-%{py_ver}
-%ghost %attr(0755,root,root)  %{_bindir}/sphinx-build
+%ghost %{_bindir}/sphinx-build
+%ghost %{_sysconfdir}/alternatives/sphinx-build
 %{_bindir}/sphinx-build-%{py_ver}
-%ghost %attr(0755,root,root)  %{_bindir}/sphinx-quickstart
+%ghost %{_bindir}/sphinx-quickstart
+%ghost %{_sysconfdir}/alternatives/sphinx-quickstart
 %{_bindir}/sphinx-quickstart-%{py_ver}
 %ghost %{_mandir}/man1/sphinx-all.1.gz
+%ghost %{_sysconfdir}/alternatives/sphinx-all.1.gz
 %{_mandir}/man1/sphinx-all-%{py_ver}.1.gz
 %ghost %{_mandir}/man1/sphinx-apidoc.1.gz
+%ghost %{_sysconfdir}/alternatives/sphinx-apidoc.1.gz
 %{_mandir}/man1/sphinx-apidoc-%{py_ver}.1.gz
 %ghost %{_mandir}/man1/sphinx-build.1.gz
+%ghost %{_sysconfdir}/alternatives/sphinx-build.1.gz
 %{_mandir}/man1/sphinx-build-%{py_ver}.1.gz
 %ghost %{_mandir}/man1/sphinx-quickstart.1.gz
+%ghost %{_sysconfdir}/alternatives/sphinx-quickstart.1.gz
 %{_mandir}/man1/sphinx-quickstart-%{py_ver}.1.gz
 %{python_sitelib}/sphinx/
 %{python_sitelib}/Sphinx-%{version}-py%{py_ver}.egg-info

sphinx-docutils-0.10.patch

@@ -1,28 +0,0 @@
-diff -up Sphinx-1.1.3/sphinx/writers/manpage.py.bak Sphinx-1.1.3/sphinx/writers/manpage.py
---- Sphinx-1.1.3/sphinx/writers/manpage.py.bak	2011-11-01 00:38:44.000000000 -0700
-+++ Sphinx-1.1.3/sphinx/writers/manpage.py	2012-08-21 12:38:33.380808202 -0700
-@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato
-         # since self.append_header() is never called, need to do this here
-         self.body.append(MACRO_DEF)
- 
-+        # Overwrite admonition label translations with our own
-+        for label, translation in admonitionlabels.items():
-+            self.language.labels[label] = self.deunicode(translation)
-+
-+
-     # overwritten -- added quotes around all .TH arguments
-     def header(self):
-         tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
-@@ -193,12 +198,6 @@ class ManualPageTranslator(BaseTranslato
-     def depart_seealso(self, node):
-         self.depart_admonition(node)
- 
--    # overwritten -- use our own label translations
--    def visit_admonition(self, node, name=None):
--        if name:
--            self.body.append('.IP %s\n' %
--                             self.deunicode(admonitionlabels.get(name, name)))
--
-     def visit_productionlist(self, node):
-         self.ensure_eol()
-         names = []