[python-docutils] Update to new upstream that has properly licensed files and a few bugfixes Add a patch to fix traceb

[Toshio くらとみ]

commit 18a18b832586ccb8dec86aef9e5fe4da36a08d46
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 5 21:38:13 2012 -0800

    Update to new upstream that has properly licensed files and a few bugfixes
    Add a patch to fix tracebacks when wrong values are given to CLI apps

 .gitignore                    |    1 +
 docutils-05-compat.sty        |  738 -----------------------------------------
 docutils-05-compat.sty.txt    |  738 -----------------------------------------
 docutils-missing-import.patch |   12 +
 python-docutils.spec          |   25 +-
 sources                       |    2 +-
 6 files changed, 23 insertions(+), 1493 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0024d98..f499f21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 docutils-0.7.tar.gz
 /docutils-0.8.tar.gz
+/docutils-0.8.1.tar.gz
diff --git a/docutils-missing-import.patch b/docutils-missing-import.patch
new file mode 100644
index 0000000..0f88742
--- /dev/null
+++ b/docutils-missing-import.patch
@@ -0,0 +1,12 @@
+--- docutils/frontend.py.org	2012-01-06 12:49:58.815655161 +0900
++++ docutils/frontend.py	2012-01-06 13:12:55.783605996 +0900
+@@ -38,7 +38,7 @@ 
+ import docutils
+ import docutils.utils
+ import docutils.nodes
+-from docutils.error_reporting import locale_encoding, ErrorOutput
++from docutils.error_reporting import locale_encoding, ErrorOutput, ErrorString
+ 
+ 
+ def store_multiple(option, opt, value, parser, *args, **kwargs):
+
diff --git a/python-docutils.spec b/python-docutils.spec
index aa10b21..a0423a4 100644
--- a/python-docutils.spec
+++ b/python-docutils.spec
@@ -10,8 +10,8 @@
 %global srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        System for processing plaintext documentation
 
 Group:          Development/Languages
@@ -19,19 +19,14 @@ Group:          Development/Languages
 License:        Public Domain and BSD and Python and GPLv3+
 URL:            http://docutils.sourceforge.net
 Source0:        http://downloads.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
-# These have been relicensed to BSD in upstream svn so use those copies
-Source1: docutils-05-compat.sty
-Source2: docutils-05-compat.sty.txt
 # Sometimes we need snapshots.  Instructions below:
 # svn co -r $REV svn://svn.berlios.de/docutils/trunk/docutils
 # cd docutils
 # python setup.py sdist
 # The tarball is in dist/docutils-VERSION.tar.gz
 #Source0:        %{srcname}-%{version}.tar.gz
-# Patches submitted upstream here:
-# https://sourceforge.net/tracker/index.php?func=detail&aid=3365041&group_id=38414&atid=422032
-Patch0: docutils-test-exceptions.patch
-Patch1: docutils-encoding.patch
+# Applied upstream.  Fixes a traceback when invalid input is given on the cli
+Patch0: docutils-missing-import.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:       noarch
 
@@ -80,14 +75,8 @@ This package contains the module, ported to run under python3.
 
 %prep
 %setup -q -n %{srcname}-%{version}
-%patch0 -p1 -b .testexc
-%patch1 -p1 -b .testencoding
-
-# Replace Apache licensed files with copies from upstream.  Next upstream
-# release should have the files licensed BSD
-cp %{SOURCE1} docutils/writers/latex2e/docutils-05-compat.sty
-cp %{SOURCE2} docs/user/docutils-05-compat.sty.txt 
 
+%patch0 -p0 -b .exc
 # Remove shebang from library files
 for file in docutils/_string_template_compat.py docutils/math/{__init__.py,latex2mathml.py}; do
 sed -i -e '/#! *\/usr\/bin\/.*/{1D}' $file
@@ -188,6 +177,10 @@ rm -rf %{buildroot}
 %{python3_sitelib}/*
 
 %changelog
+* Thu Jan 5 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8.1-1
+- Update to new upstream that has properly licensed files and a few bugfixes
+- Add a patch to fix tracebacks when wrong values are given to CLI apps
+
 * Wed Jul 20 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.8-2
 - Replace the Apache licensed files with BSD licensed versions from upstream
 
diff --git a/sources b/sources
index 3e30e52..a98104e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f57474b69bfbf0eb608706a104f92dda  docutils-0.8.tar.gz
+2ecf8ba3ece1be1ed666150a80c838c8  docutils-0.8.1.tar.gz