Revert "Merge branch 'epel7' into el6"

This reverts commit 07d6cfea6c, reversing changes made to 074da2f7e0.
Merge branch 'epel7' into el6
2014-12-16 21:42:36 +01:00 · 2014-10-13 10:02:11 +02:00 · 2014-02-17 11:54:13 +01:00
1 changed files with 6 additions and 2 deletions
--- a/python-tox.spec
+++ b/python-tox.spec
@ -21,6 +21,10 @@ BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 Requires:  python-py
 Requires:  python-virtualenv
+%if 0%{?rhel}==6
+Requires:  python-argparse
+%endif
+
 # required for check
 %if 0%{?fedora}
 BuildRequires:  python-py
@ -74,8 +78,8 @@ TOXENV=py27 %{__python} setup.py test


 %changelog
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Mon Feb 17 2014 Matthias Runge <mrunge@redhat.com> - 1.4.2-8
+- python 2.6 requires argparse (rhbz#1065824)

 * Wed Nov 14 2012 Matthias Runge <mrunge@redhat.com> - 1.4.2-7
 - add requires python-py, python-virtualenv (rhbz#876246)
Author	SHA1	Message	Date
Matthias Runge	dd772e5daa	Revert "Merge branch 'epel7' into el6" This reverts commit `07d6cfea6c`, reversing changes made to `074da2f7e0`.	2014-12-16 21:42:36 +01:00
Matthias Runge	07d6cfea6c	Merge branch 'epel7' into el6 Conflicts: python-tox.spec	2014-10-13 10:02:11 +02:00
Matthias Runge	074da2f7e0	argparse is a requirement for python 2.6 Resolves: rhbz#1065824	2014-02-17 11:54:13 +01:00