modify spec && patch

This commit is contained in:
bingo2008 2020-01-10 16:39:41 +08:00
parent 9846e3f904
commit 568ed251a9
4 changed files with 1 additions and 37495 deletions

View File

@ -1,16 +0,0 @@
diff --git a/virtualenv.py b/virtualenv.py
index c4e3bd5..89b8863 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -1181,8 +1181,9 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
exec_dir = join(sys.exec_prefix, 'Lib')
else:
exec_dir = join(sys.exec_prefix, 'lib', py_version)
- for fn in os.listdir(exec_dir):
- copyfile(join(exec_dir, fn), join(lib_dir, fn), symlink)
+ if os.path.isdir(exec_dir):
+ for fn in os.listdir(exec_dir):
+ copyfile(join(exec_dir, fn), join(lib_dir, fn), symlink)
if is_jython:
# Jython has either jython-dev.jar and javalib/ dir, or just

View File

@ -4,11 +4,7 @@ Release: 6
Summary: A tool to create isolated Python environments Summary: A tool to create isolated Python environments
License: MIT License: MIT
URL: http://pypi.python.org/pypi/virtualenv URL: http://pypi.python.org/pypi/virtualenv
Source0: http://pypi.python.org/packages/source/v/virtualenv/virtualenv-%{version}.tar.gz Source0: https://files.pythonhosted.org/packages/33/bc/fa0b5347139cd9564f0d44ebd2b147ac97c36b2403943dbee8a25fd74012/virtualenv-16.0.0.tar.gz
Patch0: check-exec_dir.patch
Patch1: python26.patch
Patch2: rpm-wheels.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: git-core python2-devel python3-devel python3-sphinx BuildRequires: git-core python2-devel python3-devel python3-sphinx

File diff suppressed because it is too large Load Diff

View File

@ -1,14 +0,0 @@
diff --git a/virtualenv.py b/virtualenv.py
index 2ad2695..a0ddfaf 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -400,6 +400,9 @@ def _find_file(filename, dirs):
def file_search_dirs():
here = os.path.dirname(os.path.abspath(__file__))
dirs = [here, join(here, 'virtualenv_support')]
+ if sys.version_info >= (2, 7):
+ # we don't insert on 2.6 because the wheels there are not compatible
+ dirs.insert(1, '/usr/share/python-wheels')
if os.path.splitext(os.path.dirname(__file__))[0] != 'virtualenv':
# Probably some boot script; just in case virtualenv is installed...
try: