From 88edf3ea33f85753a1014ad17fdac120139663e6 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@devzero.com>
Date: Mon, 20 Jan 2014 15:03:21 -0800
Subject: [PATCH] Update to 2.23.0

---
 .gitignore                          |  8 +-------
 boto-2.13.3-propagateatlaunch.patch | 19 -------------------
 boto-2.13.3-virttype.patch          | 22 ----------------------
 python-boto.spec                    | 14 ++++----------
 sources                             |  3 +--
 5 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 boto-2.13.3-propagateatlaunch.patch
 delete mode 100644 boto-2.13.3-virttype.patch

diff --git a/.gitignore b/.gitignore
index 958b943..42d5a72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,3 @@
 /*.src.rpm
 /results_*
-/boto-2.5.1.tar.gz
-/boto-2.5.2.tar.gz
-/boto-2.6.0.tar.gz
-/boto-2.9.2.tar.gz
-/boto-2.9.6.tar.gz
-/boto-2.9.9.tar.gz
-/boto-2.13.3.tar.gz
+/boto-*.tar.gz
diff --git a/boto-2.13.3-propagateatlaunch.patch b/boto-2.13.3-propagateatlaunch.patch
deleted file mode 100644
index 99fc94a..0000000
--- a/boto-2.13.3-propagateatlaunch.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: boto/boto/ec2/autoscale/tag.py
-===================================================================
---- boto.orig/boto/ec2/autoscale/tag.py
-+++ boto/boto/ec2/autoscale/tag.py
-@@ -55,11 +55,11 @@ class Tag(object):
-             self.key = value
-         elif name == 'Value':
-             self.value = value
--        elif name == 'PropogateAtLaunch':
-+        elif name == 'PropagateAtLaunch':
-             if value.lower() == 'true':
--                self.propogate_at_launch = True
-+                self.propagate_at_launch = True
-             else:
--                self.propogate_at_launch = False
-+                self.propagate_at_launch = False
-         elif name == 'ResourceId':
-             self.resource_id = value
-         elif name == 'ResourceType':
diff --git a/boto-2.13.3-virttype.patch b/boto-2.13.3-virttype.patch
deleted file mode 100644
index 244123f..0000000
--- a/boto-2.13.3-virttype.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/python-boto.spec b/python-boto.spec
index ab336cb..e61396d 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -1,7 +1,7 @@
 %{!?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.13.3
+Version:        2.23.0
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Languages
@@ -11,16 +11,9 @@ BuildRequires:  python-devel >= 2.5, python-setuptools-devel
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Needed for euca-register --virtualization-type, requested by rel-eng
-# 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
 Patch2:         boto-2.9.9-adjtype.patch
-# Fix auto-scaling PropagateAtLaunch parsing
-# https://bugzilla.redhat.com/show_bug.cgi?id=1011682
-# https://github.com/boto/boto/pull/1739
-Patch3:         boto-2.13.3-propagateatlaunch.patch
 
 
 %description
@@ -32,9 +25,7 @@ use, lightweight wrapper around the Amazon services.
 
 %prep
 %setup -q -n boto-%{version}
-%patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 rm -r boto.egg-info
 
@@ -70,6 +61,9 @@ rm -r boto.egg-info
 %{python_sitelib}/boto*.egg-info
 
 %changelog
+* Mon Jan 20 2014 Garrett Holmstrom <gholms@fedoraproject.org> - 2.23.0-1
+- Updated to 2.23.0
+
 * 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
diff --git a/sources b/sources
index de403cf..a1af4cf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-794a7db936864403ab0142a0bd03b0c3  boto-2.9.9.tar.gz
-f4e43a842db5c5010d2bddc3569028dc  boto-2.13.3.tar.gz
+b2fc1f946eed3b3577fa6fb6cf0d016d  boto-2.23.0.tar.gz