diff --git a/.gitignore b/.gitignore index 23845c2..c3a3e13 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ docutils-0.7.tar.gz /docutils-0.9.1.tar.gz /docutils-0.10.tar.gz /docutils-0.11.tar.gz +/docutils-0.12.tar.gz diff --git a/disable-failing-tests.patch b/disable-failing-tests.patch deleted file mode 100644 index c8a6304..0000000 --- a/disable-failing-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 -@@ -36,6 +36,7 @@ import StringIO - import zipfile - from xml.dom import minidom - import tempfile -+import unittest - - from __init__ import DocutilsTestSupport - -@@ -147,16 +148,22 @@ class DocutilsOdtTestCase(DocutilsTestSu - # See instructions above in module doc-string. - # - -+ @unittest.skipIf(sys.version_info[:2] == (3, 3), -+ "known failure with Python 3.3; see https://sourceforge.net/tracker/?func=detail&aid=3555164&group_id=38414&atid=422030") - def test_odt_basic(self): - self.process_test('odt_basic.txt', 'odt_basic.odt', - #save_output_name='odt_basic.odt' - ) - -+ @unittest.skipIf(sys.version_info[:2] == (3, 3), -+ "known failure with Python 3.3; see https://sourceforge.net/tracker/?func=detail&aid=3555164&group_id=38414&atid=422030") - def test_odt_tables1(self): - self.process_test('odt_tables1.txt', 'odt_tables1.odt', - #save_output_name='odt_tables1.odt' - ) - -+ @unittest.skipIf(sys.version_info[:2] == (3, 3), -+ "known failure with Python 3.3; see https://sourceforge.net/tracker/?func=detail&aid=3555164&group_id=38414&atid=422030") - def test_odt_custom_headfoot(self): - settings_overrides = { - 'custom_header': 'Page %p% of %P%', diff --git a/python-docutils.spec b/python-docutils.spec index 6ee4335..2ac102f 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -10,27 +10,21 @@ %global srcname docutils Name: python-%{srcname} -Version: 0.11 -Release: 2%{?dist} +Version: 0.12 +Release: 0.1.20140510svn7747%{?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 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 - -# 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 -Patch100: disable-failing-tests.patch - +Source0: %{srcname}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -80,7 +74,6 @@ This package contains the module, ported to run under python3. %prep %setup -q -n %{srcname}-%{version} -%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,smartquotes.py} docutils/utils/math/{latex2mathml.py,math2html.py} docutils/writers/xetex/__init__.py; do @@ -168,6 +161,10 @@ rm -rf %{buildroot} %endif %changelog +* Sat May 10 2014 Orion Poplawski - 0.12-0.1.20140510svn7747 +- Update to svn snapshot for Python 3.4 support +- Drop unneeded patch + * Fri May 9 2014 Orion Poplawski - 0.11-2 - Rebuild for Python 3.4 diff --git a/sources b/sources index cd358b5..6310d4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20ac380a18b369824276864d98ec0ad6 docutils-0.11.tar.gz +6f16c974006da27428a056baf6d5801a docutils-0.12.tar.gz