Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot

- Properly exclude python3 binaries

.gitignore

@@ -1,3 +1 @@
-/Sphinx-1.0.4.tar.gz
-/Sphinx-1.0.6.tar.gz
-/Sphinx-1.0.7.tar.gz
+/Sphinx-1.1.3.tar.gz

Sphinx-1.1.3-fix_quoting_in_inheritance.patch

@@ -0,0 +1,13 @@
+--- Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py.orig	2012-02-19 11:54:47.000000000 +0100
++++ Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py	2013-03-02 18:44:29.303047600 +0100
+@@ -199,8 +199,8 @@ class InheritanceGraph(object):
+         'shape': 'box',
+         'fontsize': 10,
+         'height': 0.25,
+-        'fontname': 'Vera Sans, DejaVu Sans, Liberation Sans, '
+-                    'Arial, Helvetica, sans',
++        'fontname': '"Vera Sans, DejaVu Sans, Liberation Sans, '
++                    'Arial, Helvetica, sans"',
+         'style': '"setlinewidth(0.5)"',
+     }
+     default_edge_attrs = {

python-sphinx.spec

@@ -1,12 +1,15 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%if 0%{?fedora}
+%global with_python3 1
+%{!?python3_version: %global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")}
+%else
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.0.7
-Release:    2%{?dist}
+Version:    1.1.3
+Release:    7%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -18,6 +21,12 @@ Group:      Development/Tools
 License:    BSD and Public Domain and Python and (MIT or GPLv2)
 URL:        http://sphinx.pocoo.org/
 Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
+# Sent upstream as a fix to work with the next version of docutils
+# https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage
+Patch0: sphinx-docutils-0.10.patch
+# Fixes quoting issue in inheritance_diagram.py
+# Already applied upstream as part of https://bitbucket.org/birkenfeld/sphinx/commits/fc1db93d21a5a535d9d62e5a0c9f0a806a8c117a
+Patch1: Sphinx-1.1.3-fix_quoting_in_inheritance.patch
 
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
@@ -25,11 +34,22 @@ BuildRequires: python-setuptools
 BuildRequires: python-docutils
 BuildRequires: python-jinja2
 BuildRequires: python-nose
+# Test dependencies
+BuildRequires: texlive-latex
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-docutils
+BuildRequires: python3-jinja2
+BuildRequires: python3-pygments
+BuildRequires: python3-nose
+%endif # with_python3
+
 Requires:      python-docutils
 Requires:      python-jinja2
 Requires:      python-pygments
 
-
 %description
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
@@ -59,6 +79,44 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
+%if 0%{?with_python3}
+%package -n python3-sphinx
+Summary:    Python documentation generator
+Group:      Development/Tools
+Requires:      python3-docutils
+Requires:      python3-jinja2
+Requires:      python3-pygments
+
+%description -n python3-sphinx
+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 to translate the new Python
+documentation, but has now been cleaned up in the hope that it will be
+useful to many other projects.
+
+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.
+
+Although it is still under constant development, the following
+features are already present, work fine and can be seen "in action" in
+the Python docs:
+
+    * Output formats: HTML (including Windows HTML Help) and LaTeX,
+      for printable PDF versions
+    * Extensive cross-references: semantic markup and automatic links
+      for functions, classes, glossary terms and similar pieces of
+      information
+    * Hierarchical structure: easy definition of a document tree, with
+      automatic links to siblings, parents and children
+    * Automatic indices: general index as well as a module index
+    * Code handling: automatic highlighting using the Pygments highlighter
+    * Various extensions are available, e.g. for automatic testing of
+      snippets and inclusion of appropriately formatted docstrings.
+%endif # with_python3
+
+
 %package doc
 Summary:    Documentation for %{name}
 Group:      Documentation
@@ -81,8 +139,23 @@ This package contains documentation in reST and HTML formats.
 %setup -q -n %{upstream_name}-%{version}%{?prerel}
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
+%patch0 -p1
+%patch1 -p1
+
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif # with_python3
+
+
 %build
 %{__python} setup.py build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
 pushd doc
 make html
 make man
@@ -94,13 +167,31 @@ popd
 %install
 rm -rf %{buildroot}
 
-%{__python} setup.py install --skip-build --root %{buildroot}
+# Must do the python3 install first because the scripts in /usr/bin are
+# overwritten with every setup.py install (and we want the python2 version
+# to be the default for now).
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+for f in %{buildroot}%{_bindir}/sphinx-*;
+do
+    mv $f $f-%{python3_version}
+done
+popd
+%endif # with_python3
 
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
 mv _build/man/sphinx-*.1 %{buildroot}%{_mandir}/man1/
+%if 0%{?with_python3}
+for f in %{buildroot}%{_mandir}/man1/sphinx-*.1;
+do
+    cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|")
+done
+%endif # with_python3
 popd
 
 # Deliver rst files
@@ -134,24 +225,79 @@ popd
 
 %check
 make test
+%if 0%{?with_python3}
+pushd %{py3dir}
+make test
+popd
+%endif # with_python3
 
 
 %files -f sphinx.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
+%exclude %{_bindir}/sphinx-*-%{python3_version}
 %{_bindir}/sphinx-*
 %{python_sitelib}/*
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
+%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
 %{_mandir}/man1/*
 
+%if 0%{?with_python3}
+%files -n python3-sphinx
+%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
+%{_bindir}/sphinx-*-%{python3_version}
+%{python3_sitelib}/*
+%dir %{_datadir}/sphinx/
+%dir %{_datadir}/sphinx/locale
+%dir %{_datadir}/sphinx/locale/*
+%{_mandir}/man1/sphinx-*-%{python3_version}.1*
+%endif # with_python3
+
 %files doc
 %defattr(-,root,root,-)
 %doc html reST
 
 
 %changelog
+* Sat Mar  9 2013 Michel Salim <salimma@fedoraproject.org> - 1.1.3-7
+- Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Aug 21 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.3-5
+- Fix for use of sphinx's manpage writer with docutils-0.10
+
+* Mon Aug  6 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-4
+- Rebuild for Python 3.3
+
+* Fri Aug  3 2012 David Malcolm <dmalcolm@redhat.com> - 1.1.3-3
+- remove rhel logic from with_python3 conditional
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Apr  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.3-1
+- Update to 1.1.3
+
+* Sun Feb  5 2012 Michel Salim <salimma@fedoraproject.org> - 1.1.2-5
+- Move python3 runtime dependencies to the right subpackage
+- Properly exclude python3 binaries
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sat Dec 17 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-3
+- BR on texlive-latex for LaTeX tests
+
+* Thu Dec  8 2011 Michel Salim <salimma@fedoraproject.org> - 1.1.2-2
+- Enable python3 subpackage
+
+* Mon Nov 28 2011 Toshio Kuratomi <toshio@fedoraproject.org> - 1.1.2-1
+- Update to upstream 1.1.2
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

sources

@@ -1 +1 @@
-42c722d48e52d4888193965dd473adb5  Sphinx-1.0.7.tar.gz
+8f55a6d4f87fc6d528120c5d1f983e98  Sphinx-1.1.3.tar.gz

sphinx-docutils-0.10.patch

@@ -0,0 +1,28 @@
+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 = []