rpms/epydoc/F-13 epydoc-3.0.1-new-docutils.patch, NONE, 1.1 import.log, NONE, 1.1 epydoc.spec, 1.17, 1.18

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/epydoc/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14075/F-13

Modified Files:
	epydoc.spec 
Added Files:
	epydoc-3.0.1-new-docutils.patch import.log 
Log Message:
Pull from Rawhide to fix #578920


epydoc-3.0.1-new-docutils.patch:
 restructuredtext.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE epydoc-3.0.1-new-docutils.patch ---
>From b293e11299566005b5d918c735bdf9c0ab5ded6f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Thu, 1 Apr 2010 20:23:12 +0200
Subject: [PATCH] Fix restructuredtext formatting for python-docutils-0.6

---
 epydoc/markup/restructuredtext.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epydoc/markup/restructuredtext.py b/epydoc/markup/restructuredtext.py
index 8b6ac04..4726cb5 100644
--- a/epydoc/markup/restructuredtext.py
+++ b/epydoc/markup/restructuredtext.py
@@ -304,10 +304,10 @@ class _SummaryExtractor(NodeVisitor):
         # Extract the first sentence.
         for child in node:
             if isinstance(child, docutils.nodes.Text):
-                m = self._SUMMARY_RE.match(child.data)
+                m = self._SUMMARY_RE.match(child)
                 if m:
                     summary_pieces.append(docutils.nodes.Text(m.group(1)))
-                    other = child.data[m.end():]
+                    other = child[m.end():]
                     if other and not other.isspace():
                         self.other_docs = True
                     break
-- 
1.7.0.1



--- NEW FILE import.log ---
epydoc-3_0_1-7_fc14:F-13:epydoc-3.0.1-7.fc14.src.rpm:1271751093


Index: epydoc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epydoc/F-13/epydoc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- epydoc.spec	8 Dec 2009 19:52:26 -0000	1.17
+++ epydoc.spec	20 Apr 2010 08:16:22 -0000	1.18
@@ -3,7 +3,7 @@
 Summary: Automatic API documentation generation tool for Python
 Name: epydoc
 Version: 3.0.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: Development/Tools
 License: MIT
 URL: http://epydoc.sourceforge.net/
@@ -11,6 +11,7 @@ Source0: http://dl.sf.net/epydoc/epydoc-
 Source1: epydocgui.desktop
 Patch0: epydoc-3.0.1-nohashbang.patch
 Patch1: epydoc-3.0.1-giftopng.patch
+Patch2: epydoc-3.0.1-new-docutils.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: tkinter
 # Needed for some outputs, like --pdf (#522249)
@@ -34,6 +35,7 @@ ReStructuredText, Javadoc, and plaintext
 %setup -q
 %patch0 -p1 -b .nohashbang
 %patch1 -p1 -b .giftopng
+%patch2 -p1 -b .new-docutils
 
 
 %build
@@ -75,6 +77,9 @@ desktop-file-install \
 
 
 %changelog
+* Tue Apr 13 2010 Lubomir Rintel <lkundrak at v3.sk> 3.0.1-7
+- Fix crash with newer docutils (#578920)
+
 * Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 3.0.1-6
 - Add texlive-dvips and texlive-latex requirements (#522249).