From f3a3bcea5e578d32b5bf610eb39c17bf4ab42e30 Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Mar 23 2018 14:52:42 +0000
Subject: Merge el6 and epel7 branches


---

diff --git a/python34.spec b/python34.spec
index e1724ca..1d9483d 100644
--- a/python34.spec
+++ b/python34.spec
@@ -1504,7 +1504,7 @@ CheckPython() {
   # our non-standard decorators take effect on the relevant tests:
   #   @unittest._skipInRpmBuild(reason)
   #   @unittest._expectedFailureInRpmBuild
-  # test_faulthandler.test_register_chain currently fails on ppc64le and
+  # test_faulthandler.test_register_chain currently fails on ppc64/ppc64le and
   #   aarch64, see upstream bug http://bugs.python.org/issue21131
   WITHIN_PYTHON_RPM_BUILD= \
   LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \
@@ -1514,7 +1514,7 @@ CheckPython() {
     -x test_ensurepip \
     -x test_venv \
     %endif
-    %ifarch ppc64 ppc64le aarch64
+    %ifarch %{power64} aarch64
     -x test_faulthandler \
     %endif
     %ifarch %{power64} s390 s390x armv7hl aarch64
@@ -1969,7 +1969,6 @@ rm -fr %{buildroot}
 * Thu Mar 22 2018 Carl George <carl@george.computer> - 3.4.8-1
 - Latest upstream
 - Patches 242, 248, and 286 merged upstream
-- Skip test_faulthandler on ppc64
 
 * Fri Dec 08 2017 Miro Hrončok <mhroncok@redhat.com> - 3.4.5-6
 - Fix for CVE-2017-1000158
@@ -1979,22 +1978,19 @@ rm -fr %{buildroot}
 - Dropped BuildRequires on db4-devel which was useful for Python 2 (module
   bsddb), however, no longer needod for Python 3
 
-* Mon May 29 2017 Charalampos Stratakis <cstratak@redhat.com> 3.4.5-4
+* Mon May 29 2017 Charalampos Stratakis <cstratak@redhat.com> 3.4.5-2
 - Do not exclude bundled setuptools and pip from the installation
-  when rewheel is disabled(rhbz#1263057)
-
-* Wed Nov  9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 3.4.5-3
-- Re-enable tests on aarch64
-
-* Thu Oct 20 2016 Peter Robinson <pbrobinson@fedoraproject.org> 3.4.5-2
-- Temporarily disable tests on aarch64
+  when rewheel is disabled(rhbz#1457590)
 
 * Fri Oct 14 2016 Orion Poplawski <orion@cora.nwra.com> - 3.4.5-1
 - Update to 3.4.5
 
-* Fri Oct 14 2016 Charalampos Stratakis <cstratak@redhat.com> - 3.4.3-9
+* Fri Oct 14 2016 Charalampos Stratakis <cstratak@redhat.com> - 3.4.3-10
 - Ensure gc tracking is off when invoking weakref callbacks
 
+* Tue Oct 04 2016 Tim Orling <ticotimo@gmail.com> - 3.4.3-9
+- disable test_faulthandler for %%{power64}, not just ppc64le
+
 * Wed Aug 24 2016 Orion Poplawski <orion@cora.nwra.com> - 3.4.3-8
 - Update to build on EL6