From 024fd362d7909b60bfadde19cb48c628892943b5 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Aug 21 2019 19:50:18 +0000 Subject: Update to 16.7.3 Resolves: rhbz#1742034 --- diff --git a/.gitignore b/.gitignore index 92f5419..ee24a02 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ noarch /virtualenv-15.1.0.tar.gz /virtualenv-16.0.0.tar.gz /virtualenv-16.6.1.tar.gz +/virtualenv-16.7.3.tar.gz diff --git a/lib64-license.patch b/lib64-license.patch deleted file mode 100644 index 6430911..0000000 --- a/lib64-license.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 01e27bd7a6ddde4db6654ab2f18def36dab64329 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Fri, 12 Jul 2019 11:58:32 +0200 -Subject: [PATCH] Also search the LICENSE file in lib64/pythonX.Y - -Several Linux distributions including Gentoo, Fedora, openSUSE -put things in lib64/pythonX.Y instead of lib/pythonX.Y on 64bit -architectures (x86_64, aarch64, etc.). - -This was already respected via the fix_lib64() function, however -when virtualenv was searching for Python LICENSE, it was not. - -Now is the lib64/pythonX.Y patch searched as well and unlike fix_lib64() -no checks need to be made, as the patch are tested in sequence. - -See https://github.com/pypa/virtualenv/issues/1352#issuecomment-510500384 ---- - virtualenv.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/virtualenv.py b/virtualenv.py -index 3ccbed6d..d4d5d304 100755 ---- a/virtualenv.py -+++ b/virtualenv.py -@@ -1333,9 +1333,12 @@ def copy_required_files(src_dir, lib_dir, symlink): - - def copy_license(prefix, dst_prefix, lib_dir, symlink): - """Copy the license file so `license()` builtin works""" -+ lib64_dir = lib_dir.replace("lib", "lib64") - for license_path in ( - # posix cpython - os.path.join(prefix, os.path.relpath(lib_dir, dst_prefix), "LICENSE.txt"), -+ # posix cpython installed in /usr/lib64 -+ os.path.join(prefix, os.path.relpath(lib64_dir, dst_prefix), "LICENSE.txt"), - # windows cpython - os.path.join(prefix, "LICENSE.txt"), - # pypy diff --git a/python-virtualenv.spec b/python-virtualenv.spec index 6557da5..25efecf 100644 --- a/python-virtualenv.spec +++ b/python-virtualenv.spec @@ -1,6 +1,6 @@ Name: python-virtualenv -Version: 16.6.1 -Release: 3%{?dist} +Version: 16.7.3 +Release: 1%{?dist} Summary: Tool to create isolated Python environments License: MIT @@ -10,10 +10,6 @@ Source0: %{pypi_source virtualenv} # Add /usr/share/python-wheels to file_search_dirs Patch1: rpm-wheels.patch -# Fix search patch for the Python LICENSE file on 64bit systems -# Proposed upstream: https://github.com/pypa/virtualenv/pull/1382 -Patch2: lib64-license.patch - BuildArch: noarch BuildRequires: git-core @@ -144,6 +140,9 @@ rm -r tmp_path %changelog +* Wed Aug 21 2019 Charalampos Stratakis - 16.7.3-1 +- Update to 16.7.3 (#1742034) + * Fri Aug 16 2019 Miro HronĨok - 16.6.1-3 - Rebuilt for Python 3.8 diff --git a/sources b/sources index 8dcc129..a790fcf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virtualenv-16.6.1.tar.gz) = 6253f44401471b6af09b38cbb3919fc35070e3168d5381c384011028e75e2ded6d13dc86304eb97b13c302ac917396727e4a6f6d0c98aa9eea885391af760620 +SHA512 (virtualenv-16.7.3.tar.gz) = 0109d4260882a1ecb93556ab6661dd42314ef45618cbbe25925dc068ed199281ae5f968dfca5ab26029a4d9e486eaae916d1287b7a3461b4d5e9b92d4ebf8b8a