From 851910d22b8313a1e72340b6284dfa692ffbfb0f Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Tue, 2 Feb 2016 14:02:28 -0800
Subject: [PATCH] Switch to systemwide copy of python-six on el7

---
 python-boto.spec | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/python-boto.spec b/python-boto.spec
index 2544620..3b39660 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -64,7 +64,7 @@ BuildRequires:  python3-requests
 
 Requires:       python-requests
 Requires:       python-rsa
-Requires:       python-six
+Requires:       python-six >= 1.7
 
 Provides:       python2-boto = %{version}-%{release}
 
@@ -104,13 +104,9 @@ cloud systems like Eucalyptus, OpenStack and Open Nebula.
 %prep
 %setup -q -n boto-%{version}
 
-%if ! 0%{?el7}
-# python-six-1.3.0-4.el7 is too old, causes ImportErrors
-# https://bugzilla.redhat.com/show_bug.cgi?id=1185409
 %patch1 -p1
 %patch2 -p1
 rm -r boto/vendored
-%endif
 
 cp -p %{SOURCE1} .
 
@@ -171,6 +167,7 @@ mv $RPM_BUILD_ROOT/%{_bindir} examples
 %changelog
 * Fri Jan 29 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 2.39.0-1
 - Updated to 2.39.0 (RH #1300424)
+- Switched to systemwide copy of python-six on el7
 
 * Mon Nov 30 2015 Ryan S. Brown <sb@ryansb.com> - 2.38.0-5
 - Add patch for unittest failure https://github.com/boto/boto/pull/3412