From 764a0d3569629069fcb5706473483535efcd89a9bfcf79f13beb1df54adad8d7 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Sat, 12 Oct 2013 15:33:59 +0000 Subject: [PATCH 1/2] Accepting request 203045 from home:posophe:branches:devel:languages:python Update OBS-URL: https://build.opensuse.org/request/show/203045 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenvwrapper?expand=0&rev=41 --- python-virtualenvwrapper.changes | 21 +++++++++++++++++++++ python-virtualenvwrapper.spec | 8 +++++--- virtualenvwrapper-4.0.tar.bz2 | 3 --- virtualenvwrapper-4.1.1.tar.gz | 3 +++ 4 files changed, 29 insertions(+), 6 deletions(-) delete mode 100644 virtualenvwrapper-4.0.tar.bz2 create mode 100644 virtualenvwrapper-4.1.1.tar.gz diff --git a/python-virtualenvwrapper.changes b/python-virtualenvwrapper.changes index 217a3c0..35a38ed 100644 --- a/python-virtualenvwrapper.changes +++ b/python-virtualenvwrapper.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Sat Oct 12 15:29:13 UTC 2013 - p.drouand@gmail.com + +- Update to version 4.1.1 + + Fix packaging issue with 4.1 +- Changes between version 4.1 and 4.0 + + Ensure that all $() style commands that produce paths are quoted. + Addresses issue 164. + + Add wipeenv command for removing all packages installed in the virtualenv. + + Allow users of virtualenvwrapper_lazy.sh to extend the list of API + commands that trigger the lazy-loader by extending _VIRTUALENVWRAPPER_API. + + Fix detection of --python option to mkvirtualenv. Resolves issue 190. + + Add allvirtualenv command to run a command across all virtualenvs. + + Fix lsvirtualenv when there are spaces in WORKON_HOME. + Resolves issue 194. + + Switch to pbr for packaging +- Add documentation from tarball and generated documentation +- Add python-pbr BuildRequirement; new build requirement needed to build +- Replace python-distribute with python-setuptools BuildRequires +- Use download URL as source + ------------------------------------------------------------------- Tue Apr 30 19:17:07 UTC 2013 - alexandre@exatati.com.br diff --git a/python-virtualenvwrapper.spec b/python-virtualenvwrapper.spec index 2c05d7f..a5c2d19 100644 --- a/python-virtualenvwrapper.spec +++ b/python-virtualenvwrapper.spec @@ -17,16 +17,17 @@ Name: python-virtualenvwrapper -Version: 4.0 +Version: 4.1.1 Release: 0 Url: http://www.doughellmann.com/projects/virtualenvwrapper/ Summary: Enhancements to virtualenv License: HPND Group: Development/Languages/Python -Source: virtualenvwrapper-%{version}.tar.bz2 +Source: https://pypi.python.org/packages/source/v/virtualenvwrapper/virtualenvwrapper-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -BuildRequires: python-distribute +BuildRequires: python-pbr +BuildRequires: python-setuptools Requires: python-stevedore Requires: python-virtualenv Requires: python-virtualenv-clone @@ -63,6 +64,7 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} %files %defattr(-,root,root,-) +%doc README.txt README.ja.rst README.es.rst LICENSE announce.rst %{python_sitelib}/* %{_bindir}/virtualenvwrapper.sh %{_bindir}/virtualenvwrapper_lazy.sh diff --git a/virtualenvwrapper-4.0.tar.bz2 b/virtualenvwrapper-4.0.tar.bz2 deleted file mode 100644 index 6f2355a..0000000 --- a/virtualenvwrapper-4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdc4249973c31757e5d69dcaec9f31cc8554c22b60fd407754ffb784b3b94205 -size 128461 diff --git a/virtualenvwrapper-4.1.1.tar.gz b/virtualenvwrapper-4.1.1.tar.gz new file mode 100644 index 0000000..1cefb20 --- /dev/null +++ b/virtualenvwrapper-4.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47ab05af0bc7f146bdd4a77a978e02a1f4e1db6a0546e836e2442fa0990d7d77 +size 81070 From 3a908ecc88c10d880fdba4cd1e0e060a5836af2b2946a17c87b859ca7aaa7807 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Sat, 12 Oct 2013 16:43:39 +0000 Subject: [PATCH 2/2] Accepting request 203050 from home:posophe:branches:devel:languages:python Implement update-alternatives OBS-URL: https://build.opensuse.org/request/show/203050 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-virtualenvwrapper?expand=0&rev=42 --- python-virtualenvwrapper.changes | 5 +++++ python-virtualenvwrapper.spec | 30 ++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/python-virtualenvwrapper.changes b/python-virtualenvwrapper.changes index 35a38ed..f8011e0 100644 --- a/python-virtualenvwrapper.changes +++ b/python-virtualenvwrapper.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 12 16:42:19 UTC 2013 - p.drouand@gmail.com + +- Implement update-alternative + ------------------------------------------------------------------- Sat Oct 12 15:29:13 UTC 2013 - p.drouand@gmail.com diff --git a/python-virtualenvwrapper.spec b/python-virtualenvwrapper.spec index a5c2d19..a9180d0 100644 --- a/python-virtualenvwrapper.spec +++ b/python-virtualenvwrapper.spec @@ -31,6 +31,8 @@ BuildRequires: python-setuptools Requires: python-stevedore Requires: python-virtualenv Requires: python-virtualenv-clone +Requires(post): update-alternatives +Requires(postun): update-alternatives %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else @@ -61,12 +63,36 @@ python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +mv %{buildroot}%{_bindir}/virtualenvwrapper_lazy.sh %{buildroot}%{_bindir}/virtualenvwrapper_lazy-%{py_ver}.sh +mv %{buildroot}%{_bindir}/virtualenvwrapper.sh %{buildroot}%{_bindir}/virtualenvwrapper-%{py_ver}.sh +ln -s %{_bindir}/virtualenvwrapper-%{py_ver}.sh %{buildroot}%{_bindir}/virtualenvwrapper.sh +ln -s %{_bindir}/virtualenvwrapper_lazy-%{py_ver}.sh %{buildroot}%{_bindir}/virtualenvwrapper_lazy.sh + +%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 + +%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} +fi %files %defattr(-,root,root,-) %doc README.txt README.ja.rst README.es.rst LICENSE announce.rst %{python_sitelib}/* -%{_bindir}/virtualenvwrapper.sh -%{_bindir}/virtualenvwrapper_lazy.sh +%ghost %{_bindir}/virtualenvwrapper.sh +%{_bindir}/virtualenvwrapper-%{py_ver}.sh +%ghost %{_bindir}/virtualenvwrapper_lazy.sh +%{_bindir}/virtualenvwrapper_lazy-%{py_ver}.sh %changelog