diff --git a/python-virtualenvwrapper.changes b/python-virtualenvwrapper.changes index 8329b79..7bf02e0 100644 --- a/python-virtualenvwrapper.changes +++ b/python-virtualenvwrapper.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Nov 16 00:03:00 UTC 2014 - Led + +- fix shebang in virtualenvwrapper_lazy.sh script that contains + bash-specific constructions +- add patches: + * virtualenvwrapper-4.2-fix-bashisms.patch + +------------------------------------------------------------------- +Sat Nov 08 20:14:00 UTC 2014 - Led + +- fix bashisms in pre script + ------------------------------------------------------------------- Sun Mar 30 09:19:03 UTC 2014 - toddrme2178@gmail.com diff --git a/python-virtualenvwrapper.spec b/python-virtualenvwrapper.spec index 7349899..b82735d 100644 --- a/python-virtualenvwrapper.spec +++ b/python-virtualenvwrapper.spec @@ -24,6 +24,7 @@ Summary: Enhancements to virtualenv License: HPND Group: Development/Languages/Python Source: https://pypi.python.org/packages/source/v/virtualenvwrapper/virtualenvwrapper-%{version}.tar.gz +Patch: virtualenvwrapper-4.2-fix-bashisms.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-pbr @@ -57,6 +58,7 @@ conflicts in their dependencies. %prep %setup -q -n virtualenvwrapper-%{version} +%patch -p1 %build python setup.py build @@ -71,16 +73,14 @@ ln -s %{_bindir}/virtualenvwrapper_lazy-%{py_ver}.sh %{buildroot}%{_bindir}/vir %pre # Since python scripts became ghosted to be used with update-alternatives, we have to get rid # of the old binary resulting from the non-update-alternativies-ified package: -[[ ! -L %{_bindir}/virtualenvwrapper.sh ]] && rm -f %{_bindir}/virtualenvwrapper.sh -[[ ! -L %{_bindir}/virtualenvwrapper_lazy.sh ]] && rm -f %{_bindir}/virtualenvwrapper_lazy.sh -exit 0 +[ -h %{_bindir}/virtualenvwrapper.sh ] || rm -f %{_bindir}/virtualenvwrapper.sh +[ -h %{_bindir}/virtualenvwrapper_lazy.sh ] || rm -f %{_bindir}/virtualenvwrapper_lazy.sh %post update-alternatives \ --install %{_bindir}/virtualenvwrapper.sh virtualenvwrapper.sh %{_bindir}/virtualenvwrapper-%{py_ver}.sh 30 \ --slave %{_bindir}/virtualenvwrapper_lazy.sh virtualenvwrapper_lazy.sh %{_bindir}/virtualenvwrapper_lazy-%{py_ver}.sh - %preun if [ $1 -eq 0 ] ; then update-alternatives --remove virtualenvwrapper.sh %{_bindir}/virtualenvwrapper.sh-%{py_ver} diff --git a/virtualenvwrapper-4.2-fix-bashisms.patch b/virtualenvwrapper-4.2-fix-bashisms.patch new file mode 100644 index 0000000..e17afe9 --- /dev/null +++ b/virtualenvwrapper-4.2-fix-bashisms.patch @@ -0,0 +1,9 @@ +diff -Ndur virtualenvwrapper-4.2/virtualenvwrapper_lazy.sh virtualenvwrapper-4.2-fix-bashisms/virtualenvwrapper_lazy.sh +--- virtualenvwrapper-4.2/virtualenvwrapper_lazy.sh 2014-01-12 19:13:28.000000000 +0200 ++++ virtualenvwrapper-4.2-fix-bashisms/virtualenvwrapper_lazy.sh 2014-11-16 02:00:13.185110170 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + # Alternative startup script for faster login times. + + export _VIRTUALENVWRAPPER_API="$_VIRTUALENVWRAPPER_API mkvirtualenv rmvirtualenv lsvirtualenv showvirtualenv workon add2virtualenv cdsitepackages cdvirtualenv lssitepackages toggleglobalsitepackages cpvirtualenv setvirtualenvproject mkproject cdproject mktmpenv"