From b16e8f3214a1f7f3ca72df8446691e39990a8bcd Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge@redhat.com>
Date: Tue, 24 Sep 2013 11:35:44 +0200
Subject: [PATCH] update to 1.6.1

---
 .gitignore      |  1 +
 python-tox.spec | 59 ++++++++++++++++++++++++++++++++++++++++++++-----
 sources         |  2 +-
 3 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 02c0850..700e65b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tox-1.4.2.zip
+/tox-1.6.1.tar.gz
diff --git a/python-tox.spec b/python-tox.spec
index 55926ab..c6a1a4b 100644
--- a/python-tox.spec
+++ b/python-tox.spec
@@ -1,3 +1,7 @@
+%if 0%{?fedora} > 12
+%global with_python3 0
+%endif
+
 # Tests requiring Internet connections are disabled by default
 # pass --with internet to run them (e.g. when doing a local rebuild
 # for sanity checks before committing)
@@ -6,15 +10,14 @@
 
 %global pypiname tox
 Name:           python-tox
-Version:        1.4.2
-Release:        9%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        Virtualenv-based automation of test activities
 
 # file toxbootstrap.py is licensed under MIT License
 License:        GPLv2+ and MIT
 URL:            http://codespeak.net/tox
-Source0:        http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.zip
-#md5=dc52acf22eb57eaa33e704f8a54e7b34
+Source0:        http://pypi.python.org/packages/source/t/%{pypiname}/%{pypiname}-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -39,13 +42,53 @@ can use for:
  - acting as a frontend to Continuous Integration servers, greatly reducing 
    boilerplate and merging CI and shell-based testing.
 
+%if 0%{?with_python3}
+%package -n python3-%{pypiname}
+Summary:        Virtualenv-based automation of test activities
+Requires:       python3-py
+Requires:       python3-virtualenv
+BuildRequires:  python3-py
+BuildRequires:  python3-pytest
+BuildRequires:  python3-virtualenv
+
+%description -n python3-%{pypiname}
+Tox as is a generic virtualenv management and test command line tool you 
+can use for:
+
+ - checking your package installs correctly with different Python versions 
+   and interpreters
+ - running your tests in each of the environments, configuring your test tool 
+   of choice
+ - acting as a frontend to Continuous Integration servers, greatly reducing 
+   boilerplate and merging CI and shell-based testing.
+%endif
+
 %prep 
 %setup -q -n %{pypiname}-%{version}
+%if 0%{?with_python3}
+cp -a . %{py3dir}
+%endif
+
 
 %build
 %{__python} setup.py build
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
+
 %install
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+mv %{buildroot}%{_bindir}/tox %{buildroot}%{_bindir}/python3-tox
+mv %{buildroot}%{_bindir}/tox-quickstart %{buildroot}%{_bindir}/python3-tox-quickstart
+popd
+%endif # with_python3
+
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
 # if internet connection available, run tests
@@ -60,20 +103,24 @@ can use for:
 #TOXENV=py26 %{__python} setup.py test
 #%endif
 
-%if 0%{?fedora}==17 || 0%{?fedora}==18
+%if 0%{?fedora}>=17 
 TOXENV=py27 %{__python} setup.py test
 %endif
 
 %endif
  
 %files
-%doc LICENSE README.txt ISSUES.txt doc
+%doc LICENSE ISSUES.txt doc
 %{_bindir}/%{pypiname}
+%{_bindir}/%{pypiname}-quickstart
 %{python_sitelib}/%{pypiname}
 %{python_sitelib}/%{pypiname}-%{version}-py2.?.egg-info
 
 
 %changelog
+* Tue Sep 24 2013 Matthias Runge <mrunge@redhat.com> - 1.6.1-1
+- update to 1.6.1
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index bb111d0..6b1a7c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc52acf22eb57eaa33e704f8a54e7b34  tox-1.4.2.zip
+853e9024d4e51f68045da8907def81c5  tox-1.6.1.tar.gz