From fd3e71870ee0e14daeb5049bc0ba21d842f5d460 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Dec 28 2016 17:38:16 +0000
Subject: New upstream version.  Drop upstreamed test patch.


---

diff --git a/.gitignore b/.gitignore
index 79f0d67..7f4538e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /zope.testrunner-4.5.0.zip
 /zope.testrunner-4.5.1.zip
+/zope.testrunner-4.6.0.zip
diff --git a/python-zope-testrunner-test.patch b/python-zope-testrunner-test.patch
deleted file mode 100644
index 9cacfad..0000000
--- a/python-zope-testrunner-test.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/zope/testrunner/tests/test_doctest.py.orig	2016-06-20 19:00:52.000000000 -0600
-+++ src/zope/testrunner/tests/test_doctest.py	2016-06-21 20:19:17.510671017 -0600
-@@ -66,7 +66,7 @@ if sys.platform == 'win32':
-         #this is a magic to put linefeeds into the doctest
-         (re.compile('##r##\n'), '\r'),
- 
--        (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
-+        (re.compile(r'(\d+ minutes )?\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
-         (re.compile(r'\d+[.]\d\d\d s'), 'N.NNN s'),
-         (re.compile(r'\d+[.]\d\d\d{'), 'N.NNN{'),
-         (re.compile(r'\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d+'),
-@@ -125,7 +125,7 @@ else:
-         (re.compile('##r##'), r'\r'),
-         (re.compile(r'\r'), '\\\\r\n'),
- 
--        (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
-+        (re.compile(r'(\d+ minutes )?\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
-         (re.compile(r'\d+[.]\d\d\d s'), 'N.NNN s'),
-         (re.compile(r'\d+[.]\d\d\d{'), 'N.NNN{'),
-         (re.compile(r'\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\.\d+'),
-@@ -322,7 +322,7 @@ def test_suite():
-             setUp=setUp, tearDown=tearDown,
-             optionflags=doctest.ELLIPSIS+doctest.NORMALIZE_WHITESPACE,
-             checker = renormalizing.RENormalizing([
--              (re.compile(r'\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
-+              (re.compile(r'(\d+ minutes )?\d+[.]\d\d\d seconds'), 'N.NNN seconds'),
-               (re.compile(r'sys refcount=\d+ +change=\d+'),
-                'sys refcount=NNNNNN change=NN'),
-               (re.compile(r'sum detail refcount=\d+ +'),
diff --git a/python-zope-testrunner.spec b/python-zope-testrunner.spec
index 4e7bd56..14268c3 100644
--- a/python-zope-testrunner.spec
+++ b/python-zope-testrunner.spec
@@ -8,15 +8,13 @@
 %global pkgname zope-testrunner
 
 Name:           python-%{pkgname}
-Version:        4.5.1
-Release:        4%{?dist}
+Version:        4.6.0
+Release:        1%{?dist}
 Summary:        Zope testrunner script
 
 License:        ZPLv2.1
 URL:            https://pypi.python.org/pypi/%{srcname}
 Source0:        https://files.pythonhosted.org/packages/source/z/%{srcname}/%{srcname}-%{version}.zip
-# Upstream patch to fix spurious test failure on ARM
-Patch0:         %{name}-test.patch
 BuildArch:      noarch
 
 BuildRequires:  help2man
@@ -73,9 +71,6 @@ This package provides a flexible test runner with layer support.
 
 %prep
 %setup -qc
-pushd %{srcname}-%{version}
-%patch0
-popd
 mv %{srcname}-%{version} python2
 
 %if %{with python3}
@@ -176,6 +171,10 @@ popd
 %endif
 
 %changelog
+* Wed Dec 28 2016 Jerry James <loganjerry@gmail.com> - 4.6.0-1
+- New upstream version
+- Drop upstreamed test patch
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 4.5.1-4
 - Rebuild for Python 3.6
 
diff --git a/sources b/sources
index 69715ff..ac1236b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f19d6ba2eee06aa310a4399f8c16639  zope.testrunner-4.5.1.zip
+SHA512 (zope.testrunner-4.6.0.zip) = 4f90f7111f36cfca95b062cacc947a6f547871e5fb182e56190009217c517566199e79c768fa4a451c945c8916ed596f54b4ff06552bde3a160a7a7e03b22ff5