From 5561312bd6f13ca3fd2319c6d5739fec38e9c523 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 9 May 2013 15:17:26 -0600
Subject: [PATCH] - Update to 2.9.2 - Spec cleanup

---
 .gitignore                        |  1 +
 python-boto-2.5.2-emptydata.patch | 19 -------------------
 python-boto.spec                  | 21 ++++++++++++---------
 sources                           |  2 +-
 4 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 python-boto-2.5.2-emptydata.patch

diff --git a/.gitignore b/.gitignore
index 07bd836..381b457 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /boto-2.5.1.tar.gz
 /boto-2.5.2.tar.gz
 /boto-2.6.0.tar.gz
+/boto-2.9.2.tar.gz
diff --git a/python-boto-2.5.2-emptydata.patch b/python-boto-2.5.2-emptydata.patch
deleted file mode 100644
index 948af03..0000000
--- a/python-boto-2.5.2-emptydata.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 6870daf7ef98579c73473fb8b8852abf6ce7f1f8
-Author: Neil Wilson <neil@aldur.co.uk>
-Date:   Wed Jul 4 16:58:53 2012 +0100
-
-    utils.py: Add guard for blank responses to get-instance-metadata
-
-diff --git a/boto/utils.py b/boto/utils.py
-index 860a26c..d71eb7a 100644
---- a/boto/utils.py
-+++ b/boto/utils.py
-@@ -251,7 +251,7 @@ class LazyLoadMetadata(dict):
-             val = boto.utils.retry_url(self._url + urllib.quote(resource,
-                                                                 safe="/:"),
-                                        num_retries=self._num_retries)
--            if val[0] == '{':
-+            if val and val[0] == '{':
-                 val = json.loads(val)
-             else:
-                 p = val.find('\n')
diff --git a/python-boto.spec b/python-boto.spec
index 0f102d5..285ab7a 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.6.0
-Release:        3%{?dist}
+Version:        2.9.2
+Release:        1%{?dist}
 License:        MIT
 Group:          Development/Languages
 URL:            https://github.com/boto/boto
@@ -20,24 +20,22 @@ use, lightweight wrapper around the Amazon services.
 
 %prep
 %setup -q -n boto-%{version}
+rm -r boto.egg-info
 
 %build
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{_bindir}/asadmin
 %{_bindir}/bundle_image
 %{_bindir}/cfadmin
 %{_bindir}/cq
 %{_bindir}/cwutil
+%{_bindir}/dynamodb_dump
+%{_bindir}/dynamodb_load
 %{_bindir}/elbadmin
 %{_bindir}/fetch_file
 %{_bindir}/glacier
@@ -46,15 +44,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/launch_instance
 %{_bindir}/list_instances
 %{_bindir}/lss3
+%{_bindir}/mturk
 %{_bindir}/pyami_sendmail
 %{_bindir}/route53
-%{_bindir}/s3multiput
 %{_bindir}/s3put
 %{_bindir}/sdbadmin
 %{_bindir}/taskadmin
-%{python_sitelib}/*
+%{python_sitelib}/boto
+%{python_sitelib}/boto*.egg-info
 
 %changelog
+* Thu May  9 2013 Orion Poplawski <orion@cora.nwra.com> - 2.9.2-1
+- Update to 2.9.2 (bug #948714)
+- Spec cleanup
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index e2db705..8f682e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f91986376c0330f837b935d833b6f6aa  boto-2.6.0.tar.gz
+18fe51b8a8d8e42d831046da8cea5d4e  boto-2.9.2.tar.gz