diff --git a/python-zope-testrunner-test.patch b/python-zope-testrunner-test.patch index 70556a4..9cacfad 100644 --- a/python-zope-testrunner-test.patch +++ b/python-zope-testrunner-test.patch @@ -1,5 +1,5 @@ ---- ./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-20 21:19:00.167656242 -0600 +--- 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'), @@ -18,3 +18,12 @@ (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 4d45e6a..4e35099 100644 --- a/python-zope-testrunner.spec +++ b/python-zope-testrunner.spec @@ -9,7 +9,7 @@ Name: python-%{pkgname} Version: 4.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zope testrunner script License: ZPLv2.1 @@ -130,9 +130,9 @@ popd pushd python2 mkdir lib cp -a %{_prefix}/lib/python%{python2_version} lib -if [ %{_libdir} != "%{_prefix}/lib" ]; then +if [ -d %{_prefix}/lib64/python%{python2_version} ]; then mkdir lib64 - cp -a %{_libdir}/python%{python2_version} lib64 + cp -a %{_prefix}/lib64/python%{python2_version} lib64 fi cp -a build/lib/zope/testrunner lib/python%{python2_version}/site-packages/zope export PYTHONHOME=$PWD:$PWD @@ -148,9 +148,9 @@ popd # pushd python3 # mkdir lib # cp -a %%{_prefix}/lib/python%%{python3_version} lib -# if [ %%{_libdir} != "%%{_prefix}/lib" ]; then +# if [ -d %%{_prefix}/lib64/python%%{python3_version} ]; then # mkdir lib64 -# cp -a %%{_libdir}/python%%{python3_version} lib64 +# cp -a %%{_prefix}/lib64/python%%{python3_version} lib64 # fi # mkdir include # cp -a %%{_includedir}/python%%{python3_version}* include @@ -179,6 +179,9 @@ popd %endif %changelog +* Tue Jun 21 2016 Jerry James - 4.5.1-2 +- Fix spurious build failures due to use of _libdir in a noarch package + * Mon Jun 20 2016 Jerry James - 4.5.1-1 - New upstream version