Change paths to bundled projects in rewheel patch

This commit is contained in:
Matej Stuchlik 2014-06-03 22:28:46 +02:00
parent 95668bdbb2
commit 1014fca077
2 changed files with 7 additions and 4 deletions

View File

@ -21,7 +21,7 @@ unchanged:
pip.main(args) 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 # omit pip and easy_install
os.environ["ENSUREPIP_OPTIONS"] = "install" os.environ["ENSUREPIP_OPTIONS"] = "install"
@ -50,9 +50,9 @@ unchanged:
- whl = pkgutil.get_data( - whl = pkgutil.get_data(
+ whl = os.path.join( + whl = os.path.join(
+ os.path.dirname(__file__), + os.path.dirname(__file__),
"ensurepip", - "ensurepip",
- "_bundled/{}".format(wheel_name), - "_bundled/{}".format(wheel_name),
+ "bundled", + "_bundled",
+ "{}-{}-py2.py3-none-any.whl".format(project, version) + "{}-{}-py2.py3-none-any.whl".format(project, version)
) )
- with open(os.path.join(tmpdir, wheel_name), "wb") as fp: - with open(os.path.join(tmpdir, wheel_name), "wb") as fp:

View File

@ -140,7 +140,7 @@
Summary: Version 3 of the Python programming language aka Python 3000 Summary: Version 3 of the Python programming language aka Python 3000
Name: python3 Name: python3
Version: %{pybasever}.1 Version: %{pybasever}.1
Release: 8%{?dist} Release: 9%{?dist}
License: Python License: Python
Group: Development/Languages Group: Development/Languages
@ -1853,6 +1853,9 @@ rm -fr %{buildroot}
# ====================================================== # ======================================================
%changelog %changelog
* Tue Jun 03 2014 Matej Stuchlik <mstuchli@redhat.com> - 3.4.1-9
- Change paths to bundled projects in rewheel patch
* Fri May 30 2014 Miro Hrončok <mhroncok@redhat.com> - 3.4.1-8 * Fri May 30 2014 Miro Hrončok <mhroncok@redhat.com> - 3.4.1-8
- In config script, use uname -m to write the arch - In config script, use uname -m to write the arch