- add python 3 subpackage (#536948)

Also, fix typo in prior changelog entry ( 3.2-22 -> 3.2-2 )

python-coverage.spec

@@ -1,9 +1,13 @@
+%if 0%{?fedora} > 12 || 0%{?rhel} > 6
+%global with_python3 1
+%endif
+
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-coverage
 Summary:        Code coverage testing module for Python
 Version:        3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD
 Group:          System Environment/Libraries
 URL:            http://nedbatchelder.com/code/modules/coverage.html
@@ -11,6 +15,10 @@ Source0:        http://pypi.python.org/packages/source/c/coverage/coverage-%{ver
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-setuptools, python-devel
 Requires:       python-setuptools
+%if 0%{?with_python3}
+BuildRequires:  /usr/bin/2to3
+BuildRequires:  python3-setuptools, python3-devel
+%endif # with_python3
 
 %description
 Coverage.py is a Python module that measures code coverage during Python 
@@ -18,17 +26,53 @@ execution. It uses the code analysis tools and tracing hooks provided in the
 Python standard library to determine which lines are executable, and which 
 have been executed.
 
+%if 0%{?with_python3}
+%package -n python3-coverage
+Summary:        Code coverage testing module for Python 3
+Group:          System Environment/Libraries
+# As the "coverage" executable requires the setuptools at runtime (#556290),
+# so the "python3-coverage" executable requires python3-setuptools:
+Requires:       python3-setuptools
+
+%description -n python3-coverage
+Coverage.py is a Python 3 module that measures code coverage during Python
+execution. It uses the code analysis tools and tracing hooks provided in the 
+Python standard library to determine which lines are executable, and which 
+have been executed.
+%endif # with_python3
+
 %prep
 %setup -q -n coverage-%{version}
 chmod -x README.txt
 sed -i 's/\r//g' README.txt
 chmod -x coverage.egg-info/*.txt
 
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+pushd %{py3dir}
+2to3 --nobackups --write .
+popd
+%endif # if with_python3
+
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # if with_python3
+
 %install
 rm -rf %{buildroot}
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+mv %{buildroot}/%{_bindir}/coverage %{buildroot}/%{_bindir}/python3-coverage
+popd
+%endif # if with_python3
+
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 %clean
@@ -41,8 +85,20 @@ rm -rf %{buildroot}
 %{python_sitearch}/coverage/
 %{python_sitearch}/coverage*.egg-info/
 
+%if 0%{?with_python3}
+%files -n python3-coverage
+%defattr(-,root,root,-)
+%{_bindir}/python3-coverage
+%{python3_sitearch}/coverage/
+%{python3_sitearch}/coverage*.egg-info/
+%endif # if with_python3
+
+
 %changelog
-* Sun Jan 17 2010 Luke Macken <lmacken@redhat.com> - 3.2-22
+* Fri Feb  5 2010 David Malcolm <dmalcolm@redhat.com> - 3.2-3
+- add python 3 subpackage (#536948)
+
+* Sun Jan 17 2010 Luke Macken <lmacken@redhat.com> - 3.2-2
 - Require python-setuptools (#556290)
 
 * Wed Dec  9 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 3.2-1