Merge branch 'f21' into f20

python-tox.spec

@@ -12,7 +12,7 @@
 %global pypiname tox
 Name:           python-tox
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
@@ -20,6 +20,8 @@ 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
 BuildRequires:  python-setuptools
@@ -66,6 +68,8 @@ can use for:
 
 %prep 
 %setup -q -n %{pypiname}-%{version}
+%patch0 -p1
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -120,6 +124,10 @@ TOXENV=py27 %{__python} setup.py test
 
 
 %changelog
+* 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)
+
 * Wed Jul 30 2014 Matthias Runge <mrunge@redhat.com> - 1.7.1-2
 - require virtualenv >= 1.11.2 (rhbz#1122603)