From 2ebb1af32f9a1c3c2228517ac24502b7c5784a01 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Aug 24 2012 17:21:14 +0000
Subject: Rebase to new snapshot with some fixes integrated


- Reenable one test that I can't replicate the failure with.

---

diff --git a/disable-failing-tests.patch b/disable-failing-tests.patch
index 6f7e41f..390ae92 100644
--- a/disable-failing-tests.patch
+++ b/disable-failing-tests.patch
@@ -10,26 +10,6 @@ diff -up docutils-0.10/test/test_error_reporting.py.disable-failing-tests docuti
      def test_unicode(self):
          self.assertEqual(u'Exception: spam',
                           unicode(ErrorString(Exception(u'spam'))))
-diff -up docutils-0.10/test/test_parsers/test_rst/test_inline_markup.py.disable-failing-tests docutils-0.10/test/test_parsers/test_rst/test_inline_markup.py
---- docutils-0.10/test/test_parsers/test_rst/test_inline_markup.py.disable-failing-tests	2012-07-30 23:57:17.000000000 -0400
-+++ docutils-0.10/test/test_parsers/test_rst/test_inline_markup.py	2012-08-23 21:00:02.493284448 -0400
-@@ -10,10 +10,17 @@ Tests for inline markup in docutils/pars
- Interpreted text tests are in a separate module, test_interpreted.py.
- """
- 
-+import sys
-+
- from __init__ import DocutilsTestSupport
- 
- def suite():
-     s = DocutilsTestSupport.ParserTestSuite()
-+
-+    if 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"
-+        return s
-+
-     s.generateTests(totest)
-     return s
  
 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
diff --git a/python-docutils.spec b/python-docutils.spec
index 9368396..584b8cb 100644
--- a/python-docutils.spec
+++ b/python-docutils.spec
@@ -11,7 +11,7 @@
 
 Name:           python-%{srcname}
 Version:        0.10
-Release:        0.4.20120730svn7490%{?dist}
+Release:        0.5.20120824svn7502%{?dist}
 Summary:        System for processing plaintext documentation
 
 Group:          Development/Languages
@@ -20,27 +20,23 @@ 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 7490 https://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils
+# svn co -r 7502 https://docutils.svn.sourceforge.net/svnroot/docutils/trunk/docutils
 # cd docutils
 # python setup.py sdist
 # The tarball is in dist/docutils-VERSION.tar.gz
 Source0:        %{srcname}-%{version}.tar.gz
-# Upstream provided patch for pyxml issue
-Patch0: docutils-0.9.1-pyxml-upstream.patch
-
-# Fix implicit dict-ordering assumption in a couple of places where hash
-# randomization (on by default in Python 3.3) can affect the order in which
-# items appear in the "gold" output of selftests:
-# Filed upstream as:
-#   https://sourceforge.net/tracker/?func=detail&aid=3555160&group_id=38414&atid=422032
-Patch1: fix-dict-ordering.patch
+#Patch0: docutils-__import__-tests.patch
+#Patch1: docutils-__import__-fixes.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
-Patch2: disable-failing-tests.patch
+# 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
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -91,10 +87,9 @@ This package contains the module, ported to run under python3.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-
-%patch0 -p1 -b .pyxml
-%patch1 -p1
-%patch2 -p1 -b .disable-failing-tests
+#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
@@ -116,12 +111,6 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 pushd %{py3dir}
 
 CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
-# Docutils setup.py does this on build but only to the built copy, not to the
-# original source.  For running the tests afterwards we need to have access to everything
-#for dir in docutils test tools ; do
-#rm -rf $dir
-#cp -pr build/lib/$dir .
-#done
 popd
 %endif # with_python3
 
@@ -181,6 +170,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Aug 24 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.10-0.5.20120824svn7502
+- Rebase to new snapshot with some fixes integrated
+- Reenable one test that I can't replicate the failure with.
+
 * Fri Aug 24 2012 David Malcolm <dmalcolm@redhat.com> - 0.10-0.4.20120730svn7490
 - fix/disable failing tests with python 3.3
 
diff --git a/sources b/sources
index 2a79540..e554e65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-43ed371231c96b4b58e1797e994df0aa  docutils-0.10.tar.gz
+15fd0b6f035501f5315aeaf576059eb3  docutils-0.10.tar.gz