[python-docutils/f19] Rebase to revision 7687

[Matej Stuchlik]

commit ae521c805bc8bb1bdc61002ae784526f221e9d1c
Author: Matej Stuchlik <mstuchli at redhat.com>
Date:   Thu Jul 11 08:54:59 2013 +0200

    Rebase to revision 7687

 disable-failing-tests.patch      |   13 --
 docutils-__import__-fixes2.patch |   66 ---------
 docutils-__import__-tests.patch  |  300 --------------------------------------
 python-docutils.spec             |   22 +--
 4 files changed, 8 insertions(+), 393 deletions(-)
---
diff --git a/disable-failing-tests.patch b/disable-failing-tests.patch
index 390ae92..c8a6304 100644
--- a/disable-failing-tests.patch
+++ b/disable-failing-tests.patch
@@ -1,16 +1,3 @@
-diff -up docutils-0.10/test/test_error_reporting.py.disable-failing-tests docutils-0.10/test/test_error_reporting.py
---- docutils-0.10/test/test_error_reporting.py.disable-failing-tests	2012-07-30 23:57:17.000000000 -0400
-+++ docutils-0.10/test/test_error_reporting.py	2012-08-23 20:54:50.761166815 -0400
-@@ -145,6 +145,8 @@ class ErrorStringTests(unittest.TestCase
-         self.assertEqual('ImportError: %s' % SafeString(self.us),
-                          str(ErrorString(ImportError(self.us))))
- 
-+    @unittest.skipIf(sys.version_info[:2] == (3, 3),
-+                     "known failure with Python 3.3; http://sourceforge.net/tracker/?func=detail&aid=3561133&group_id=38414&atid=422030")
-     def test_unicode(self):
-         self.assertEqual(u'Exception: spam',
-                          unicode(ErrorString(Exception(u'spam'))))
- 
 diff -up docutils-0.10/test/test_writers/test_odt.py.disable-failing-tests docutils-0.10/test/test_writers/test_odt.py
 --- docutils-0.10/test/test_writers/test_odt.py.disable-failing-tests	2012-07-30 23:57:13.000000000 -0400
 +++ docutils-0.10/test/test_writers/test_odt.py	2012-08-23 20:54:50.763166817 -0400
diff --git a/python-docutils.spec b/python-docutils.spec
index f718357..0a29538 100644
--- a/python-docutils.spec
+++ b/python-docutils.spec
@@ -10,8 +10,8 @@
 %global srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.10
-Release:        0.8.20120824svn7502%{?dist}
+Version:        0.11
+Release:        0.1.20130715svn7687%{?dist}
 Summary:        System for processing plaintext documentation
 
 Group:          Development/Languages
@@ -20,23 +20,15 @@ License:        Public Domain and BSD and Python and GPLv3+
 URL:            http://docutils.sourceforge.net
 #Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 # Sometimes we need snapshots.  Instructions below:
-# svn co -r 7502 https://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils
+# svn co -r 7687 svn://svn.code.sf.net/p/docutils/code/trunk/docutils
 # cd docutils
 # python setup.py sdist
 # The tarball is in dist/docutils-VERSION.tar.gz
 Source0:        %{srcname}-%{version}.tar.gz
-# Submitted upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=3560841&group_id=38414&atid=422030
-Patch0: docutils-__import__-tests.patch
-Patch1: docutils-__import__-fixes2.patch
 
 # Disable some tests known to fail with Python 3.3
 # Bug reports filed upstream as:
 #   https://sourceforge.net/tracker/?func=detail&aid=3555164&group_id=38414&atid=422030
-# and:
-#   http://sourceforge.net/tracker/?func=detail&aid=3561133&group_id=38414&atid=422030
-# Unicode test is failing because of a python3.3b2 bug:
-# ImportError(b'str').__str__() returns bytes rather than str
-# http://bugs.python.org/issue15778
 Patch100: disable-failing-tests.patch
 
 
@@ -88,12 +80,10 @@ This package contains the module, ported to run under python3.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p0
-%patch1 -p0
 %patch100 -p1 -b .disable-failing-tests
 
 # Remove shebang from library files
-for file in docutils/utils/{code_analyzer.py,punctuation_chars.py,error_reporting.py} docutils/utils/math/{latex2mathml.py,math2html.py} docutils/writers/xetex/__init__.py; do
+for file in docutils/utils/{code_analyzer.py,punctuation_chars.py,error_reporting.py,smartquotes.py} docutils/utils/math/{latex2mathml.py,math2html.py} docutils/writers/xetex/__init__.py; do
 sed -i -e '/#! *\/usr\/bin\/.*/{1D}' $file
 done
 
@@ -171,6 +161,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Jul 15 2013 Matej Stuchlik <mstuchli at redhat.com> - 0.11-0.1.20130715svn7687
+- Rebased to new snapshot
+- Removed unnecessary patches
+
 * Thu Mar 21 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.10-0.8.20120824svn7502
 - Add python3-imaging support :-)