From 1014fca077e1a1a399c3718553afd5cc1d24ab9a Mon Sep 17 00:00:00 2001 From: Matej Stuchlik Date: Tue, 3 Jun 2014 22:28:46 +0200 Subject: [PATCH] Change paths to bundled projects in rewheel patch --- 00189-add-rewheel-module.patch | 6 +++--- python3.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/00189-add-rewheel-module.patch b/00189-add-rewheel-module.patch index b3804b8..ddb39f9 100644 --- a/00189-add-rewheel-module.patch +++ b/00189-add-rewheel-module.patch @@ -21,7 +21,7 @@ unchanged: pip.main(args) -@@ -87,20 +90,40 @@ def bootstrap(*, root=None, upgrade=Fals +@@ -87,20 +90,39 @@ def bootstrap(*, root=None, upgrade=Fals # omit pip and easy_install os.environ["ENSUREPIP_OPTIONS"] = "install" @@ -50,9 +50,9 @@ unchanged: - whl = pkgutil.get_data( + whl = os.path.join( + os.path.dirname(__file__), - "ensurepip", +- "ensurepip", - "_bundled/{}".format(wheel_name), -+ "bundled", ++ "_bundled", + "{}-{}-py2.py3-none-any.whl".format(project, version) ) - with open(os.path.join(tmpdir, wheel_name), "wb") as fp: diff --git a/python3.spec b/python3.spec index 7bc69d4..622890c 100644 --- a/python3.spec +++ b/python3.spec @@ -140,7 +140,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python3 Version: %{pybasever}.1 -Release: 8%{?dist} +Release: 9%{?dist} License: Python Group: Development/Languages @@ -1853,6 +1853,9 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Tue Jun 03 2014 Matej Stuchlik - 3.4.1-9 +- Change paths to bundled projects in rewheel patch + * Fri May 30 2014 Miro Hrončok - 3.4.1-8 - In config script, use uname -m to write the arch