From bcda69f6348daf4d2063190af702f0a239cb479d Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: May 31 2017 01:11:53 +0000
Subject: New upstream version.


Also:
- subunit is no longer a dependency.
- Enable python 3 tests.

---

diff --git a/.gitignore b/.gitignore
index 7f4538e..f55ea48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /zope.testrunner-4.5.0.zip
 /zope.testrunner-4.5.1.zip
 /zope.testrunner-4.6.0.zip
+/zope.testrunner-4.7.0.zip
diff --git a/python-zope-testrunner.spec b/python-zope-testrunner.spec
index d0733c4..6eef180 100644
--- a/python-zope-testrunner.spec
+++ b/python-zope-testrunner.spec
@@ -8,8 +8,8 @@
 %global pkgname zope-testrunner
 
 Name:           python-%{pkgname}
-Version:        4.6.0
-Release:        2%{?dist}
+Version:        4.7.0
+Release:        1%{?dist}
 Summary:        Zope testrunner script
 
 License:        ZPLv2.1
@@ -22,7 +22,6 @@ BuildRequires:  python2-devel
 BuildRequires:  python-fixtures
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-six
-BuildRequires:  python-subunit
 BuildRequires:  python-zope-exceptions
 BuildRequires:  python-zope-interface
 BuildRequires:  python-zope-testing
@@ -32,7 +31,6 @@ BuildRequires:  python3-devel
 BuildRequires:  python3-fixtures
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-six
-BuildRequires:  python3-subunit
 BuildRequires:  python3-zope-exceptions
 BuildRequires:  python3-zope-interface
 BuildRequires:  python3-zope-testing
@@ -44,7 +42,6 @@ This package provides a flexible test runner with layer support.
 %package -n python2-%{pkgname}
 Summary:        Zope testrunner script
 Requires:       python2-six
-Requires:       python-subunit
 Requires:       python-zope-exceptions
 Requires:       python-zope-interface
 Requires:       python-zope-testing
@@ -58,7 +55,6 @@ This package provides a flexible test runner with layer support.
 %package     -n python3-%{pkgname}
 Summary:        Zope testrunner script
 Requires:       python3-six
-Requires:       python3-subunit
 Requires:       python3-zope-exceptions
 Requires:       python3-zope-interface
 Requires:       python3-zope-testing
@@ -131,26 +127,21 @@ export PYTHONHOME=$PWD:$PWD
 %{__python2} setup.py test
 popd
 
-# %%if %%{with python3}
-# The python 3 tests currently do not work.  The subunit developers say the
-# problem lies with zope: https://bugs.launchpad.net/subunit/+bug/1336384.
-# The zope developers are working on the problem, but haven't fixed it yet:
-# https://github.com/zopefoundation/zope.testrunner/pull/23.
-#
-# pushd python3
-# mkdir lib
-# cp -a %%{_prefix}/lib/python%%{python3_version} lib
-# if [ -d %%{_prefix}/lib64/python%%{python3_version} ]; then
-#   mkdir lib64
-#   cp -a %%{_prefix}/lib64/python%%{python3_version} lib64
-# fi
-# mkdir include
-# cp -a %%{_includedir}/python%%{python3_version}* include
-# cp -a build/lib/zope/testrunner lib/python%%{python3_version}/site-packages/zope
-# export PYTHONHOME=$PWD:$PWD
-# %%{__python3} setup.py test
-# popd
-# %%endif
+%if %{with python3}
+pushd python3
+mkdir lib
+cp -a %{_prefix}/lib/python%{python3_version} lib
+if [ -d %{_prefix}/lib64/python%{python3_version} ]; then
+  mkdir lib64
+  cp -a %{_prefix}/lib64/python%{python3_version} lib64
+fi
+mkdir include
+cp -a %{_includedir}/python%{python3_version}* include
+cp -a build/lib/zope/testrunner lib/python%{python3_version}/site-packages/zope
+export PYTHONHOME=$PWD:$PWD
+%{__python3} setup.py test
+popd
+%endif
 
 %files -n python2-%{pkgname}
 %doc python2/CHANGES.rst python2/README.rst
@@ -171,6 +162,11 @@ popd
 %endif
 
 %changelog
+* Tue May 30 2017 Jerry James <loganjerry@gmail.com> - 4.7.0-1
+- New upstream version
+- subunit is no longer a dependency
+- Enable python 3 tests
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index ac1236b..901898a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zope.testrunner-4.6.0.zip) = 4f90f7111f36cfca95b062cacc947a6f547871e5fb182e56190009217c517566199e79c768fa4a451c945c8916ed596f54b4ff06552bde3a160a7a7e03b22ff5
+SHA512 (zope.testrunner-4.7.0.zip) = edda96e6871d954bb1f46ca18e2de9d1726d68cb3787f080b3b858c4dbdc2ceeb809962d178350a354e16c04711a89b2c6d1f663f256e1f72c15a7c494e51d32