From cfa9e5212dede627c2069b9877cec6c9d7007971 Mon Sep 17 00:00:00 2001 From: Matej Stuchlik Date: May 27 2014 10:42:42 +0000 Subject: Update rewheel module --- diff --git a/00189-add-rewheel-module.patch b/00189-add-rewheel-module.patch index ad80e9f..b3804b8 100644 --- a/00189-add-rewheel-module.patch +++ b/00189-add-rewheel-module.patch @@ -75,7 +75,7 @@ unchanged: unchanged: --- Python-3.4.0rc3/Lib/ensurepip/rewheel/__init__.py 1970-01-01 01:00:00.000000000 +0100 +++ Python-3.4.0rc3-rewheel/Lib/ensurepip/rewheel/__init__.py 2014-03-12 09:55:30.413152104 +0100 -@@ -0,0 +1,133 @@ +@@ -0,0 +1,136 @@ +import argparse +import csv +import email.parser @@ -126,7 +126,10 @@ unchanged: + # if we have 0 or 2 or more dirs, something is wrong... + if len(filtered) == 1: + path = filtered[0] -+ records.append(os.path.join(path, 'RECORD')) ++ if path is not None: ++ records.append(os.path.join(path, 'RECORD')) ++ else: ++ records.append(None) + return records + +def rewheel_from_record(record_path, outdir): diff --git a/python3.spec b/python3.spec index d962c3f..c373aee 100644 --- a/python3.spec +++ b/python3.spec @@ -128,7 +128,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python3 Version: %{pybasever}.1 -Release: 2%{?dist} +Release: 3%{?dist} License: Python Group: Development/Languages @@ -1396,8 +1396,8 @@ CheckPython() { WITHIN_PYTHON_RPM_BUILD= \ LD_LIBRARY_PATH=$ConfDir $ConfDir/python -m test.regrtest \ --verbose --findleaks \ - %ifarch %{arm} - -x test_faulthandler test_gdb + %ifarch ppc64le + -x test_faulthandler %endif echo FINISHED: CHECKING OF PYTHON FOR CONFIGURATION: $ConfName @@ -1829,6 +1829,9 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Tue May 27 2014 Matej Stuchlik - 3.4.1-3 +- Update the rewheel module + * Mon May 26 2014 Miro HronĨok - 3.4.1-2 - Fix multilib dependencies. Resolves: rhbz#1091815