[python-html5lib/f20] Merge changes from master for python-3 support

[kumarpraveen]

commit 158d09571ce252b9f99ffb670a4c43da013ecd66
Author: Praveen Kumar <prkumar at redhat.com>
Date:   Thu Jun 12 09:19:40 2014 +0530

    Merge changes from master for python-3 support

 python-html5lib.spec |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/python-html5lib.spec b/python-html5lib.spec
index 9e164de..59da8ef 100644
--- a/python-html5lib.spec
+++ b/python-html5lib.spec
@@ -4,7 +4,7 @@
 Name:		python-%{modulename}
 Summary:	A python based HTML parser/tokenizer
 Version:	0.999
-Release:	2%{?dist}
+Release:	4%{?dist}
 Epoch:		1
 Group:		Development/Libraries
 License:	MIT
@@ -19,16 +19,6 @@ BuildRequires:	python2-devel
 BuildRequires:	python-nose
 BuildRequires:	python-six
 
-%if 1%{?with_python3}
-Requires:	python3-six
-BuildRequires:	python3-devel
-BuildRequires:	python-tools
-BuildRequires:	python3-nose
-BuildRequires:	python3-six
-BuildRequires:	python3-setuptools
-%endif
-
-
 %description
 A python based HTML parser/tokenizer based on the WHATWG HTML5 
 specification for maximum compatibility with major desktop web browsers.
@@ -38,6 +28,13 @@ specification for maximum compatibility with major desktop web browsers.
 Summary:	A python based HTML parser/tokenizer 
 Group:		Development/Libraries 
 
+Requires:	python3-six
+BuildRequires:	python3-devel
+BuildRequires:	python-tools
+BuildRequires:	python3-nose
+BuildRequires:	python3-six
+BuildRequires:	python3-setuptools
+
 %description -n python3-%{modulename}
 A python based HTML parser/tokenizer based on the WHATWG HTML5 
 specification for maximum compatibility with major desktop web browsers.
@@ -77,7 +74,7 @@ nosetests
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-nosetests-3.3
+nosetests-%{python3_version}
 popd
 %endif
 
@@ -95,6 +92,12 @@ popd
 
 
 %changelog
+* Wed May 14 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 1:0.999-4
+- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+
+* Fri May 09 2014 Dennis Gilmore <dennis at ausil.us> - 0.999-3
+- move python3 Requires and BuildRequires into the python3 sub-package
+
 * Wed Mar 12 2014 Dan Scott <dan at coffeecode.net> - 0.999-2
 - "six" module is a runtime requirement