- added docutils-0.10 patch (docutils 0.10 compatibility) found on lp

- release 4

diff --git a/sphinx-docutils-0.10.patch b/sphinx-docutils-0.10.patch
new file mode 100644 (file)
index 0000000..7f4f331
--- /dev/null
+++ b/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 = []

diff --git a/sphinx-pdg.spec b/sphinx-pdg.spec
index d048cf28273ebfd13dedf2d14328ef405ca6b659..c9d96ba857f065a52cb05d62107a53ff6c200bb1 100644 (file)
--- a/sphinx-pdg.spec
+++ b/sphinx-pdg.spec
@@ -5,11 +5,12 @@ Summary:      Sphinx - Python documentation generator
 Summary(pl.UTF-8):     Sphinx - narzędzie do tworzenia dokumentacji dla Pythona
 Name:          sphinx-pdg
 Version:       1.1.3
-Release:       3
+Release:       4
 License:       BSD
 Group:         Development/Languages/Python
 Source0:       http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz
 # Source0-md5: 8f55a6d4f87fc6d528120c5d1f983e98
+Patch0:                sphinx-docutils-0.10.patch
 URL:           http://sphinx.pocoo.org/
 BuildRequires: python-devel >= 1:2.5
 BuildRequires: python-distribute
@@ -110,12 +111,13 @@ sphinx-pdg-3.
 
 %prep
 %setup -q -n Sphinx-%{version}
+%patch0 -p1
 
 %build
 %{__python} setup.py build -b build-2
-rm sphinx/__init__.pyc
+%{__rm} sphinx/__init__.pyc
 %{__python3} setup.py build -b build-3
-rm -r sphinx/__pycache__
+%{__rm} -r sphinx/__pycache__
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -123,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__python3} setup.py build -b build-3 install \
        --optimize=2 \
        --root=$RPM_BUILD_ROOT
-rm -r sphinx/__pycache__
+%{__rm} -r sphinx/__pycache__
 
 for f in $RPM_BUILD_ROOT%{_bindir}/*; do
        mv "${f}" "${f}-3"
@@ -132,7 +134,7 @@ done
 %{__python} setup.py build -b build-2 install \
        --optimize=2 \
        --root=$RPM_BUILD_ROOT
-rm sphinx/__init__.pyc
+%{__rm} sphinx/__init__.pyc
 
 %py_postclean