From 51a0fabcc44263b128d522b13ea55e28d33d8e86 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@fedoraproject.org>
Date: Thu, 26 Sep 2013 14:52:58 -0700
Subject: [PATCH] Update to 2.13.3

---
 .gitignore                 |  1 +
 boto-2.13.3-virttype.patch | 22 ++++++++++++++++++++++
 boto-2.9.6-virttype.patch  | 23 -----------------------
 python-boto.spec           | 16 +++++++++++-----
 sources                    |  1 +
 5 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 boto-2.13.3-virttype.patch
 delete mode 100644 boto-2.9.6-virttype.patch

diff --git a/.gitignore b/.gitignore
index 60eff54..6e077e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /boto-2.9.2.tar.gz
 /boto-2.9.6.tar.gz
 /boto-2.9.9.tar.gz
+/boto-2.13.3.tar.gz
diff --git a/boto-2.13.3-virttype.patch b/boto-2.13.3-virttype.patch
new file mode 100644
index 0000000..244123f
--- /dev/null
+++ b/boto-2.13.3-virttype.patch
@@ -0,0 +1,22 @@
+Index: boto/boto/ec2/connection.py
+===================================================================
+--- boto.orig/boto/ec2/connection.py
++++ boto/boto/ec2/connection.py
+@@ -260,7 +260,7 @@ class EC2Connection(AWSQueryConnection):
+     def register_image(self, name=None, description=None, image_location=None,
+                        architecture=None, kernel_id=None, ramdisk_id=None,
+                        root_device_name=None, block_device_map=None,
+-                       dry_run=False):
++                       dry_run=False, virtualization_type=None):
+         """
+         Register an image.
+ 
+@@ -315,6 +315,8 @@ class EC2Connection(AWSQueryConnection):
+             block_device_map.ec2_build_list_params(params)
+         if dry_run:
+             params['DryRun'] = 'true'
++        if virtualization_type:
++            params['VirtualizationType'] = virtualization_type
+         rs = self.get_object('RegisterImage', params, ResultSet, verb='POST')
+         image_id = getattr(rs, 'imageId', None)
+         return image_id
diff --git a/boto-2.9.6-virttype.patch b/boto-2.9.6-virttype.patch
deleted file mode 100644
index a169bff..0000000
--- a/boto-2.9.6-virttype.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: boto-2.9.6/boto/ec2/connection.py
-===================================================================
---- boto-2.9.6.orig/boto/ec2/connection.py
-+++ boto-2.9.6/boto/ec2/connection.py
-@@ -235,7 +235,8 @@ class EC2Connection(AWSQueryConnection):
- 
-     def register_image(self, name=None, description=None, image_location=None,
-                        architecture=None, kernel_id=None, ramdisk_id=None,
--                       root_device_name=None, block_device_map=None):
-+                       root_device_name=None, block_device_map=None,
-+                       _virtualization_type=None):
-         """
-         Register an image.
- 
-@@ -283,6 +284,8 @@ class EC2Connection(AWSQueryConnection):
-             params['ImageLocation'] = image_location
-         if root_device_name:
-             params['RootDeviceName'] = root_device_name
-+        if _virtualization_type:
-+            params['VirtualizationType'] = _virtualization_type
-         if block_device_map:
-             block_device_map.build_list_params(params)
-         rs = self.get_object('RegisterImage', params, ResultSet, verb='POST')
diff --git a/python-boto.spec b/python-boto.spec
index 6d104ab..c166875 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Summary:        A simple lightweight interface to Amazon Web Services
 Name:           python-boto
-Version:        2.9.9
-Release:        2%{?dist}
+Version:        2.13.3
+Release:        1%{?dist}
 License:        MIT
 Group:          Development/Languages
 URL:            https://github.com/boto/boto
@@ -12,9 +12,11 @@ BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Needed for euca-register --virtualization-type, requested by rel-eng
-Patch2:         boto-2.9.6-virttype.patch
+# https://github.com/boto/boto/pull/1733
+Patch1:         boto-2.13.3-virttype.patch
+# Fix auto-scaling get_all_adjustment_types
 # https://github.com/boto/boto/pull/1538
-Patch3:         boto-2.9.9-adjtype.patch
+Patch2:         boto-2.9.9-adjtype.patch
 
 
 %description
@@ -26,8 +28,8 @@ use, lightweight wrapper around the Amazon services.
 
 %prep
 %setup -q -n boto-%{version}
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 rm -r boto.egg-info
 
 %build
@@ -62,6 +64,10 @@ rm -r boto.egg-info
 %{python_sitelib}/boto*.egg-info
 
 %changelog
+* Thu Sep 26 2013 Garrett Holmstrom <gholms@fedoraproject.org> - 2.13.3-1
+- Updated to 2.13.3
+- Note that this version changes register_image's virtualization_type parameter
+
 * Mon Jul 29 2013 Garrett Holmstrom <gholms@fedoraproject.org> - 2.9.9-2
 - Re-fixed autoscaling policy parsing (boto #1538)
 
diff --git a/sources b/sources
index 84f1add..de403cf 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 794a7db936864403ab0142a0bd03b0c3  boto-2.9.9.tar.gz
+f4e43a842db5c5010d2bddc3569028dc  boto-2.13.3.tar.gz