[euca2ools] Fix Boto 2.0 compatibility

[gholms]

commit 1e1b9de5d475c1e086afc12488b802c040b4e062
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Mar 7 14:21:48 2011 -0800

    Fix Boto 2.0 compatibility

 euca2ools-1.3.1-boto20.patch |   49 ++++++++++++++++++++++++++++++++++++++++++
 euca2ools.spec               |    8 ++++++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/euca2ools-1.3.1-boto20.patch b/euca2ools-1.3.1-boto20.patch
new file mode 100644
index 0000000..dde9d39
--- /dev/null
+++ b/euca2ools-1.3.1-boto20.patch
@@ -0,0 +1,49 @@
+--- euca2ools-1.3.1/bin/euca-delete-bundle.boto20	2010-09-04 06:01:51.000000000 -0700
++++ euca2ools-1.3.1/bin/euca-delete-bundle	2011-03-07 14:11:59.118516970 -0800
+@@ -40,7 +40,6 @@ from xml.dom import minidom
+ from euca2ools import Euca2ool, FileValidationError, Util, \
+     ConnectionFailed
+ from boto.exception import S3ResponseError
+-from boto.s3 import Connection
+ from boto.s3.key import Key
+ 
+ usage_string = \
+--- euca2ools-1.3.1/bin/euca-download-bundle.boto20	2011-03-07 14:03:04.228563367 -0800
++++ euca2ools-1.3.1/bin/euca-download-bundle	2011-03-07 14:13:31.383258699 -0800
+@@ -40,7 +40,6 @@ from xml.dom import minidom
+ from euca2ools import Euca2ool, FileValidationError, Util, \
+     ConnectionFailed
+ from boto.exception import S3ResponseError
+-from boto.s3 import Connection
+ from boto.s3.key import Key
+ 
+ usage_string = \
+--- euca2ools-1.3.1/bin/euca-upload-bundle.boto20	2010-09-04 06:01:51.000000000 -0700
++++ euca2ools-1.3.1/bin/euca-upload-bundle	2011-03-07 14:10:48.589950583 -0800
+@@ -40,7 +40,6 @@ from xml.dom import minidom
+ from euca2ools import Euca2ool, FileValidationError, Util, \
+     ConnectionFailed
+ from boto.exception import S3ResponseError, S3CreateError
+-from boto.s3 import Connection
+ from boto.s3.key import Key
+ 
+ usage_string = \
+--- euca2ools-1.3.1/euca2ools/euca2ools/__init__.py.boto20	2011-03-08 11:21:03.963393347 -0800
++++ euca2ools-1.3.1/euca2ools/euca2ools/__init__.py	2011-03-08 11:23:19.065142500 -0800
+@@ -53,6 +53,7 @@ from boto.ec2.regioninfo import RegionIn
+ from boto.ec2.blockdevicemapping import BlockDeviceMapping
+ from boto.ec2.blockdevicemapping import EBSBlockDeviceType
+ from boto.ec2.connection import EC2Connection
++from boto.s3.connection import S3Connection
+ from boto.resultset import ResultSet
+ import logging
+ import base64
+@@ -648,7 +649,7 @@ class Euca2ool:
+                 path=self.service_path,
+                 )
+         else:
+-            return boto.s3.Connection(
++            return S3Connection(
+                 aws_access_key_id=self.ec2_user_access_key,
+                 aws_secret_access_key=self.ec2_user_secret_key,
+                 is_secure=self.is_secure,
diff --git a/euca2ools.spec b/euca2ools.spec
index 81571dc..b2c4281 100644
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@ -2,7 +2,7 @@
 
 Name:           euca2ools
 Version:        1.3.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Elastic Utility Computing Architecture Command-Line Tools
 
 Group:          Applications/Internet
@@ -51,6 +51,8 @@ Patch17:        euca2ools-1.3.1-fsid.patch
 Patch18:        euca2ools-1.3.1-userdata.patch
 # https://bugs.launchpad.net/euca2ools/+bug/725170
 Patch19:        euca2ools-1.3.1-srcnet.patch
+# Boto 2.0 compatibility
+Patch20:        euca2ools-1.3.1-boto20.patch
 
 Requires:       m2crypto
 Requires:       python-boto
@@ -93,6 +95,7 @@ Eucalyptus.  These tools are also compatible with Amazon AWS.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 
 %build
@@ -128,6 +131,9 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Mon Mar  7 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.3.1-8
+- Fix Boto 2.0 compatibility
+
 * Fri Mar  4 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.3.1-7
 - Fix backtrace when --user-data-file does not exist [LP:726901]
 - Don't require source subnet when (de)authorizing [LP:725170]