[Django/el6] fix sphinx-build (backport from 1.4 branch
Matthias Runge
mrunge at fedoraproject.org
Tue Apr 17 20:24:10 UTC 2012
commit ab05a1417a170a174f91523130f33d051966b59d
Author: Matthias Runge <mrunge at matthias-runge.de>
Date: Tue Apr 17 22:23:41 2012 +0200
fix sphinx-build (backport from 1.4 branch
Django.spec | 3 +++
django-1.3.1-doc-sphinx.patch | 11 +++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/Django.spec b/Django.spec
index 54ea381..a86fd49 100644
--- a/Django.spec
+++ b/Django.spec
@@ -12,6 +12,7 @@ URL: http://www.djangoproject.com/
Source0: http://media.djangoproject.com/releases/1.3/Django-%{version}.tar.gz
# stub simplejson module that imports the system version
Source1: simplejson-init.py
+Patch0: django-1.3.1-doc-sphinx.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -46,6 +47,8 @@ Python Web framework.
%prep
%setup -q
+%patch0
+
# remove bundled simplejson
cd django/utils/simplejson/
rm -rf *
diff --git a/django-1.3.1-doc-sphinx.patch b/django-1.3.1-doc-sphinx.patch
new file mode 100644
index 0000000..16aced3
--- /dev/null
+++ b/django-1.3.1-doc-sphinx.patch
@@ -0,0 +1,11 @@
+diff -up ./docs/_ext/djangodocs.py.bak ./docs/_ext/djangodocs.py
+--- ./docs/_ext/djangodocs.py.bak 2012-04-17 22:13:49.826983675 +0200
++++ ./docs/_ext/djangodocs.py 2012-04-17 22:14:39.979478987 +0200
+@@ -133,6 +133,7 @@ class DjangoHTMLTranslator(SmartyPantsHT
+ def visit_desc_parameterlist(self, node):
+ self.body.append('(')
+ self.first_param = 1
++ self.param_separator = node.child_text_separator
+
+ def depart_desc_parameterlist(self, node):
+ self.body.append(')')
More information about the scm-commits
mailing list