Merge branch 'f21' into f20

.gitignore

@@ -1,5 +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
-/tox-2.1.1.tar.gz

python-tox.spec

@@ -1,6 +1,6 @@
 %if 0%{?fedora} > 12
 # virtualenv for python3 is missing
-%global with_python3 1
+%global with_python3 0
 %endif
 
 # Tests requiring Internet connections are disabled by default
@@ -11,7 +11,7 @@
 
 %global pypiname tox
 Name:           python-tox
-Version:        2.1.1
+Version:        1.7.1
 Release:        3%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
@@ -20,18 +20,18 @@ 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
 Requires:  python-py
 Requires:  python-virtualenv >= 1.11.2
-Requires:  python-pluggy
 # required for check
 %if 0%{?fedora}
 BuildRequires:  python-py
 BuildRequires:  pytest
-BuildRequires:  python-virtualenv >= 1.11.2
+BuildRequires:  python-virtualenv
 %endif
 
 %description
@@ -49,8 +49,6 @@ can use for:
 %package -n python3-%{pypiname}
 Summary:        Virtualenv-based automation of test activities
 Requires:       python3-py
-Requires:       python3-pluggy
-# python3-virtualenv is rhbz#537246
 Requires:       python3-virtualenv
 BuildRequires:  python3-py
 BuildRequires:  python3-pytest
@@ -68,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}
@@ -113,44 +109,21 @@ popd
 #TOXENV=py26 %{__python} setup.py test
 #%endif
 
-%if 0%{?fedora}>=17
+%if 0%{?fedora}>=17 
 TOXENV=py27 %{__python} setup.py test
 %endif
 
 %endif
-
+ 
 %files
-%doc ISSUES.txt doc
-%license LICENSE
+%doc LICENSE ISSUES.txt doc
 %{_bindir}/%{pypiname}
 %{_bindir}/%{pypiname}-quickstart
 %{python_sitelib}/%{pypiname}
 %{python_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
 
-%if 0%{?with_python3}
-%files -n python3-tox
-%{_bindir}/python3-%{pypiname}
-%{_bindir}/python3-%{pypiname}-quickstart
-%{python3_sitelib}/%{pypiname}
-%{python3_sitelib}/%{pypiname}-%{version}-py%{python3_version}.egg-info
-%endif
 
 %changelog
-* Thu Nov 12 2015 Kalev Lember <klember@redhat.com> - 2.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
-
-* Tue Aug 25 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-2
-- add requirement: python-pluggy
-
-* Tue Aug 18 2015 Matthias Runge <mrunge@redhat.com> - 2.1.1-1
-- update to 2.1.1
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* 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 @@
-fc5b38cce701ced90a89b9da24af1769  tox-2.1.1.tar.gz
+ec85bbfc7bd29600e91aa0e9754645d0  tox-1.7.1.tar.gz