From 970d4d2a47f96d2a7341eef6e3a669abeb352e9e Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Tue, 9 Jun 2015 13:27:14 -0700
Subject: [PATCH] Fix ImportErrors on RHEL 7

https://bugzilla.redhat.com/show_bug.cgi?id=1229863
---
 python-boto.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/python-boto.spec b/python-boto.spec
index e225ab4..0f4535b 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -24,7 +24,7 @@
 Summary:        A simple, lightweight interface to Amazon Web Services
 Name:           python-boto
 Version:        2.38.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          Development/Languages
 URL:            https://github.com/boto/boto
@@ -105,18 +105,18 @@ cloud systems like Eucalyptus, OpenStack and Open Nebula.
 
 %prep
 %setup -q -n boto-%{version}
-%patch1 -p1
-
-cp -p %{SOURCE1} .
-
-rm -r boto.egg-info
 
 %if ! 0%{?el7}
 # python-six-1.3.0-4.el7 is too old, causes ImportErrors
-# https://bugzilla.redhat.com/show_bug.cgi?id=1210896
+# https://bugzilla.redhat.com/show_bug.cgi?id=1185409
+%patch1 -p1
 rm -r boto/vendored
 %endif
 
+cp -p %{SOURCE1} .
+
+rm -r boto.egg-info
+
 
 %build
 %{__python2} setup.py build
@@ -172,6 +172,9 @@ mv $RPM_BUILD_ROOT/%{_bindir} examples
 
 
 %changelog
+* Tue Jun  9 2015 Garrett Holmstrom <gholms@fedoraproject.org> - 2.38.0-2
+- Fixed ImportErrors on RHEL 7 (RH #1229863)
+
 * Fri Apr 10 2015 Garrett Holmstrom <gholms@fedoraproject.org> - 2.38.0-1
 - Updated to 2.38.0
 - Added BuildRequires for python-six