rpms/python-sphinx
6
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Michel Alexandre Salim 2013-03-09 10:27:22 +07:00
parent 98372232f5
commit 90515d9f9d
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Sphinx-1.1.3-fix_quoting_in_inheritance.patch Normal file
View File

@ -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 = {

9
python-sphinx.spec
View File

@ -9,7 +9,7 @@
Name: python-sphinx Name: python-sphinx
Version: 1.1.3 Version: 1.1.3
Release: 6%{?dist} Release: 7%{?dist}
Summary: Python documentation generator Summary: Python documentation generator
Group: Development/Tools Group: Development/Tools
@ -24,6 +24,9 @@ Source0: http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream
# Sent upstream as a fix to work with the next version of docutils # 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 # https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage
Patch0: sphinx-docutils-0.10.patch 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 BuildArch: noarch
BuildRequires: python2-devel >= 2.4 BuildRequires: python2-devel >= 2.4
@ -137,6 +140,7 @@ This package contains documentation in reST and HTML formats.
sed '1d' -i sphinx/pycode/pgen2/token.py sed '1d' -i sphinx/pycode/pgen2/token.py
%patch0 -p1 %patch0 -p1
%patch1 -p1
%if 0%{?with_python3} %if 0%{?with_python3}
rm -rf %{py3dir} rm -rf %{py3dir}
@ -257,6 +261,9 @@ popd
%changelog %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 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild