Merge branch 'f21' into f20

.gitignore

@@ -1,4 +1,3 @@
 /tox-1.4.2.zip
 /tox-1.6.1.tar.gz
 /tox-1.7.1.tar.gz
-/tox-1.8.1.tar.gz

python-tox.spec

@@ -11,8 +11,8 @@
 
 %global pypiname tox
 Name:           python-tox
-Version:        1.8.1
-Release:        1%{?dist}
+Version:        1.7.1
+Release:        3%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
@@ -20,6 +20,7 @@ License:        GPLv2+ and MIT
 URL:            http://codespeak.net/tox
 Source0:        http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
 
+Patch0:         python-tox-Fix-command-expansion-and-parsing.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -30,7 +31,7 @@ Requires:  python-virtualenv >= 1.11.2
 %if 0%{?fedora}
 BuildRequires:  python-py
 BuildRequires:  pytest
-BuildRequires:  python-virtualenv >= 1.11.2
+BuildRequires:  python-virtualenv
 %endif
 
 %description
@@ -48,7 +49,6 @@ can use for:
 %package -n python3-%{pypiname}
 Summary:        Virtualenv-based automation of test activities
 Requires:       python3-py
-# python3-virtualenv is rhbz#537246
 Requires:       python3-virtualenv
 BuildRequires:  python3-py
 BuildRequires:  python3-pytest
@@ -66,11 +66,9 @@ can use for:
    boilerplate and merging CI and shell-based testing.
 %endif
 
-%prep
+%prep 
 %setup -q -n %{pypiname}-%{version}
-
-# remove bundled egg-info
-rm -rf %{pypiname}.egg-info
+%patch0 -p1
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -126,9 +124,6 @@ TOXENV=py27 %{__python} setup.py test
 
 
 %changelog
-* Tue Dec 16 2014 Matthias Runge <mrunge@redhat.com> - 1.8.1-1
-- update to 1.8.1
-
 * Wed Aug 13 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-3
 - Fix ConfigError: ConfigError: substitution key 'posargs' not found
   (rhbz#1127961, rhbz#1128562)

sources

@@ -1 +1 @@
-c4423cc6512932b37e5b0d1faa87bef2  tox-1.8.1.tar.gz
+ec85bbfc7bd29600e91aa0e9754645d0  tox-1.7.1.tar.gz