Re-fix autoscaling policy parsing (boto #1538)

boto-2.9.9-adjtype.patch

@@ -1,8 +1,8 @@
-Index: boto-2.9.6/boto/ec2/autoscale/policy.py
+Index: boto-2.9.9/boto/ec2/autoscale/policy.py
 ===================================================================
---- boto-2.9.6.orig/boto/ec2/autoscale/policy.py
-+++ boto-2.9.6/boto/ec2/autoscale/policy.py
-@@ -47,17 +47,17 @@ class Alarm(object):
+--- boto-2.9.9.orig/boto/ec2/autoscale/policy.py
++++ boto-2.9.9/boto/ec2/autoscale/policy.py
+@@ -47,16 +47,17 @@ class Alarm(object):
  class AdjustmentType(object):
      def __init__(self, connection=None):
          self.connection = connection
@@ -19,9 +19,8 @@ Index: boto-2.9.6/boto/ec2/autoscale/policy.py
 +        return
  
      def endElement(self, name, value, connection):
--        return
 +        if name == 'AdjustmentType':
-+            return self.adjustment_types
++            self.adjustment_type = value
+         return
  
  
- class MetricCollectionTypes(object):

python-boto.spec

@@ -2,7 +2,7 @@
 Summary:        A simple lightweight interface to Amazon Web Services
 Name:           python-boto
 Version:        2.9.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 Group:          Development/Languages
 URL:            https://github.com/boto/boto
@@ -11,10 +11,10 @@ BuildRequires:  python-devel >= 2.5, python-setuptools-devel
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# https://github.com/boto/boto/pull/1538
-Patch1:         boto-2.9.6-adjtype.patch
 # Needed for euca-register --virtualization-type, requested by rel-eng
 Patch2:         boto-2.9.6-virttype.patch
+# https://github.com/boto/boto/pull/1538
+Patch3:         boto-2.9.9-adjtype.patch
 
 
 %description
@@ -26,8 +26,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 +62,9 @@ rm -r boto.egg-info
 %{python_sitelib}/boto*.egg-info
 
 %changelog
+* Mon Jul 29 2013 Garrett Holmstrom <gholms@fedoraproject.org> - 2.9.9-2
+- Re-fixed autoscaling policy parsing (boto #1538)
+
 * Thu Jul 25 2013 Orion Poplawski <orion@cora.nwra.com> - 2.9.9-1
 - Update to 2.9.9