From 65a02f421e2641dda7e06dcef043555e7192e0bb Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Sep 28 2018 13:52:36 +0000
Subject: fix default binary names


---

diff --git a/0001-Python-3-default-binaries.patch b/0001-Python-3-default-binaries.patch
deleted file mode 100644
index f2adfc7..0000000
--- a/0001-Python-3-default-binaries.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 01352fd3531c768593cf7c1282fb5fdfc52f042d Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Mon, 19 Mar 2018 14:50:47 +0100
-Subject: [PATCH] Python 3 default binaries
-
----
- virtualenvwrapper.sh      | 6 +++---
- virtualenvwrapper_lazy.sh | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/virtualenvwrapper.sh b/virtualenvwrapper.sh
-index 9c0b1ac..d21becf 100644
---- a/virtualenvwrapper.sh
-+++ b/virtualenvwrapper.sh
-@@ -47,19 +47,19 @@
- # Locate the global Python where virtualenvwrapper is installed.
- if [ "${VIRTUALENVWRAPPER_PYTHON:-}" = "" ]
- then
--    VIRTUALENVWRAPPER_PYTHON="$(command \which python)"
-+    VIRTUALENVWRAPPER_PYTHON="$(command \which python3)"
- fi
- 
- # Set the name of the virtualenv app to use.
- if [ "${VIRTUALENVWRAPPER_VIRTUALENV:-}" = "" ]
- then
--    VIRTUALENVWRAPPER_VIRTUALENV="virtualenv"
-+    VIRTUALENVWRAPPER_VIRTUALENV="virtualenv-3"
- fi
- 
- # Set the name of the virtualenv-clone app to use.
- if [ "${VIRTUALENVWRAPPER_VIRTUALENV_CLONE:-}" = "" ]
- then
--    VIRTUALENVWRAPPER_VIRTUALENV_CLONE="virtualenv-clone"
-+    VIRTUALENVWRAPPER_VIRTUALENV_CLONE="virtualenv-clone-3"
- fi
- 
- # Define script folder depending on the platorm (Win32/Unix)
-diff --git a/virtualenvwrapper_lazy.sh b/virtualenvwrapper_lazy.sh
-index 3902d08..da54c4b 100644
---- a/virtualenvwrapper_lazy.sh
-+++ b/virtualenvwrapper_lazy.sh
-@@ -5,11 +5,11 @@ export _VIRTUALENVWRAPPER_API="$_VIRTUALENVWRAPPER_API mkvirtualenv rmvirtualenv
- 
- if [ -z "$VIRTUALENVWRAPPER_SCRIPT" ]
- then
--    export VIRTUALENVWRAPPER_SCRIPT="$(command \which virtualenvwrapper.sh)"
-+    export VIRTUALENVWRAPPER_SCRIPT="$(command \which virtualenvwrapper-3.sh)"
- fi
- if [ -z "$VIRTUALENVWRAPPER_SCRIPT" ]
- then
--    echo "ERROR: virtualenvwrapper_lazy.sh: Could not find virtualenvwrapper.sh" 1>&2
-+    echo "ERROR: virtualenvwrapper_lazy-3.sh: Could not find virtualenvwrapper-3.sh" 1>&2
- fi
- 
- # Load the real implementation of the API from virtualenvwrapper.sh
--- 
-2.14.3
-
diff --git a/python-virtualenvwrapper-4.8.2-default-binaries.patch b/python-virtualenvwrapper-4.8.2-default-binaries.patch
new file mode 100644
index 0000000..0589551
--- /dev/null
+++ b/python-virtualenvwrapper-4.8.2-default-binaries.patch
@@ -0,0 +1,29 @@
+diff -up virtualenvwrapper-4.8.2/virtualenvwrapper_lazy.sh.default-binaries virtualenvwrapper-4.8.2/virtualenvwrapper_lazy.sh
+--- virtualenvwrapper-4.8.2/virtualenvwrapper_lazy.sh.default-binaries	2018-09-28 15:43:12.316145003 +0200
++++ virtualenvwrapper-4.8.2/virtualenvwrapper_lazy.sh	2018-09-28 15:44:34.491084969 +0200
+@@ -5,11 +5,11 @@ export _VIRTUALENVWRAPPER_API="$_VIRTUAL
+ 
+ if [ -z "$VIRTUALENVWRAPPER_SCRIPT" ]
+ then
+-    export VIRTUALENVWRAPPER_SCRIPT="$(command \which virtualenvwrapper.sh)"
++    export VIRTUALENVWRAPPER_SCRIPT="$(command \which virtualenvwrapper-3.sh)"
+ fi
+ if [ -z "$VIRTUALENVWRAPPER_SCRIPT" ]
+ then
+-    echo "ERROR: virtualenvwrapper_lazy.sh: Could not find virtualenvwrapper.sh" 1>&2
++    echo "ERROR: virtualenvwrapper_lazy-3.sh: Could not find virtualenvwrapper-3.sh" 1>&2
+ fi
+ 
+ # Load the real implementation of the API from virtualenvwrapper.sh
+diff -up virtualenvwrapper-4.8.2/virtualenvwrapper.sh.default-binaries virtualenvwrapper-4.8.2/virtualenvwrapper.sh
+--- virtualenvwrapper-4.8.2/virtualenvwrapper.sh.default-binaries	2018-09-28 15:43:12.316145003 +0200
++++ virtualenvwrapper-4.8.2/virtualenvwrapper.sh	2018-09-28 15:45:32.496042583 +0200
+@@ -47,7 +47,7 @@
+ # Locate the global Python where virtualenvwrapper is installed.
+ if [ "${VIRTUALENVWRAPPER_PYTHON:-}" = "" ]
+ then
+-    VIRTUALENVWRAPPER_PYTHON="$(command \which python)"
++    VIRTUALENVWRAPPER_PYTHON="$(command \which python3)"
+ fi
+ 
+ # Set the name of the virtualenv app to use.
diff --git a/python-virtualenvwrapper.spec b/python-virtualenvwrapper.spec
index 4a80c61..d7b9670 100644
--- a/python-virtualenvwrapper.spec
+++ b/python-virtualenvwrapper.spec
@@ -8,14 +8,14 @@ one project at a time without introducing conflicts in their dependencies.
 
 Name:             python-%{modname}
 Version:          4.8.2
-Release:          6%{?dist}
+Release:          7%{?dist}
 Summary:          %{sum}
 
 Group:            Development/Languages
 License:          MIT
 URL:              https://pypi.python.org/pypi/%{modname}
 Source0:          https://pypi.python.org/packages/source/v/%{modname}/%{modname}-%{version}.tar.gz
-Patch0:           0001-Python-3-default-binaries.patch
+Patch0:           python-virtualenvwrapper-4.8.2-default-binaries.patch
 
 BuildArch:        noarch
 
@@ -71,7 +71,7 @@ rm -rf %{modname}.egg-info
 cp %{modname}.sh %{modname}-2.sh
 cp %{modname}_lazy.sh %{modname}_lazy-2.sh
 # Fix default binaries
-patch -p1 < %{PATCH0}
+%patch0 -p1 -b .default-binaries
 # Copy patched version
 cp %{modname}.sh %{modname}-3.sh
 cp %{modname}_lazy.sh %{modname}_lazy-3.sh
@@ -128,6 +128,9 @@ ln -s %{_bindir}/virtualenvwrapper_lazy-3.sh %{buildroot}/%{_sysconfdir}/profile
 %config(noreplace) %{_sysconfdir}/profile.d/virtualenvwrapper-3.sh
 
 %changelog
+* Fri Sep 28 2018 Nils Philippsen <nils@redhat.com> - 4.8.2-7
+- fix default binary names
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild