From da1ca05216a844c3946bdb8915ab7c97521e1008 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Thu, 18 Nov 2010 22:14:48 +0100
Subject: [PATCH] Added patch to fix parameter of build_list_params() (#647005)

---
 python-boto-1.9b-prefix.patch | 15 +++++++++++++++
 python-boto.spec              |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 python-boto-1.9b-prefix.patch

diff --git a/python-boto-1.9b-prefix.patch b/python-boto-1.9b-prefix.patch
new file mode 100644
index 0000000..9f8eb7f
--- /dev/null
+++ b/python-boto-1.9b-prefix.patch
@@ -0,0 +1,15 @@
+The build_list_parameters function only contains half of the fix applied by upstream
+commit 79f6a6cc7b2420440091. Specifically, line 78 refers to a function parameter that
+was renamed. More details at: https://bugzilla.redhat.com/show_bug.cgi?id=647005
+
+--- boto-1.9b/boto/ec2/blockdevicemapping.py		2009-12-16 17:21:40.000000000 +0100
++++ boto-1.9b/boto/ec2/blockdevicemapping.py.prefix	2010-11-18 21:59:07.000000000 +0100
+@@ -75,7 +75,7 @@
+     def build_list_params(self, params, prefix=''):
+         i = 1
+         for dev_name in self:
+-            pre = '%sBlockDeviceMapping.%d' % (pre, i)
++            pre = '%sBlockDeviceMapping.%d' % (prefix, i)
+             params['%s.DeviceName' % pre] = dev_name
+             ebs = self[dev_name]
+             if ebs.snapshot_id:
diff --git a/python-boto.spec b/python-boto.spec
index 0aae22e..d22c076 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -4,12 +4,13 @@
 Summary:	A simple lightweight interface to Amazon Web Services
 Name:		python-boto
 Version:	1.9b
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	MIT
 Group:		Development/Languages
 URL:		http://code.google.com/p/%{pkgname}/
 Source:		http://boto.googlecode.com/files/%{pkgname}-%{version}.tar.gz
 Patch0:		python-boto-1.9b-image.patch
+Patch1:		python-boto-1.9b-prefix.patch
 BuildRequires:	python-devel, python-setuptools-devel
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,7 @@ use, lightweight wrapper around the Amazon services.
 %prep
 %setup -q -n %{pkgname}-%{version}
 %patch0 -p1 -b .image
+%patch1 -p1 -b .prefix
 
 %build
 %{__python} setup.py build
@@ -48,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu Nov 18 2010 Robert Scheck <robert@fedoraproject.org> 1.9b-4
+- Added patch to fix parameter of build_list_params() (#647005)
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 1.9b-3
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild