Update to snapshot that's supposed to take care of the date directive unicode

problem in a different way
- Patch to fix PyXML conflict without using rpm conflicts

python-docutils.spec

@@ -10,22 +10,22 @@
 %global srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.9.1
+Version:        0.10
-Release:        1%{?dist}
+Release:        0.1.20120730svn7490%{?dist}
 Summary:        System for processing plaintext documentation
 
 Group:          Development/Languages
 # See COPYING.txt for information
 License:        Public Domain and BSD and Python and GPLv3+
 URL:            http://docutils.sourceforge.net
-Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 # Sometimes we need snapshots.  Instructions below:
-# svn co -r $REV svn://svn.berlios.de/docutils/trunk/docutils
+# svn co -r 7490 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
+Source0:        %{srcname}-%{version}.tar.gz
-Patch0: docutils-0.9.1-unicode.patch
+Patch0: docutils-0.9.1-pyxml.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
@@ -39,11 +39,6 @@ BuildRequires:  python-tools
 Requires: python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
-# Need to resolve this.  The python stdlib is importing PyXML code if
-# available.  But the PyXML code has some bugs and is outdated compared to the
-# stdlib.  Sent email to try and get a plan to resolve this:
-# http://lists.fedoraproject.org/pipermail/devel/2012-July/170075.html
-Conflicts: PyXML
 
 %description
 The Docutils project specifies a plaintext markup language, reStructuredText,
@@ -79,10 +74,11 @@ This package contains the module, ported to run under python3.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .unic
+
+%patch0 -p1 -b .pyxml
 
 # Remove shebang from library files
-for file in docutils/_string_template_compat.py docutils/math/{__init__.py,latex2mathml.py}; do
+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
 sed -i -e '/#! *\/usr\/bin\/.*/{1D}' $file
 done
 
@@ -164,6 +160,11 @@ rm -rf %{buildroot}
 %{python3_sitelib}/*
 
 %changelog
+* Mon Jul 30 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.10-0.1.20120730svn7490
+- Update to snapshot that's supposed to take care of the date directive unicode
+  problem in a different way
+- Patch to fix PyXML conflict without using rpm conflicts
+
 * Fri Jul 20 2012 Toshio Kuratomi <toshio@fedoraproject.org> - 0.9.1-1
 - New update from upstream
 - Fixes for previous patches incorporated there