[python26-boto/el5: 2/2] Merge remote-tracking branch 'python-boto/master' into el5

[gholms]

commit 7a34495367fca5d8b5243275f62e438bb58d9020
Merge: f5026f3 4b2dc4e
Author: Garrett Holmstrom <gholms at devzero.com>
Date:   Wed Feb 12 14:18:33 2014 -0800

    Merge remote-tracking branch 'python-boto/master' into el5
    
    Conflicts:
    	python26-boto.spec

 boto-2.25.0-roboto-param.patch |   21 +++++++++++++++++++++
 python26-boto.spec             |   11 ++++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --cc python26-boto.spec
index 6ae8645,0dd353b..c7954d9
--- a/python26-boto.spec
+++ b/python26-boto.spec
@@@ -1,23 -1,22 +1,28 @@@
 +# Use Python 2.6
 +%global pybasever 2.6
 +%global __python_ver 26
 +%global __python %{_bindir}/python%{?pybasever}
 +%global __os_install_post %{?__multiple_python_os_install_post}
 +
  %{!?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.25.0
 -Release:        2%{?dist}
 -License:        MIT
 -Group:          Development/Languages
 -URL:            https://github.com/boto/boto
 -Source:         http://pypi.python.org/packages/source/b/boto/boto-%{version}.tar.gz
 -BuildRequires:  python-devel >= 2.5, python-setuptools-devel
 -BuildArch:      noarch
 -BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 +Summary:	A simple lightweight interface to Amazon Web Services
 +Name:		python%{__python_ver}-boto
 +Version:	2.25.0
- Release:	1%{?dist}
++Release:	2%{?dist}
 +License:	MIT
 +Group:		Development/Languages
 +URL:		https://github.com/boto/boto
 +Source:		http://pypi.python.org/packages/source/b/boto/boto-%{version}.tar.gz
 +Requires:	python%{?__python_ver}
 +BuildRequires:	python%{?__python_ver}-devel, python%{?__python_ver}-setuptools
 +BuildArch:	noarch
 +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
+ # Fix roboto parameter type conversion
+ # https://github.com/boto/boto/pull/2094
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1064550
+ Patch1:         boto-2.25.0-roboto-param.patch
+ 
 -
  %description
  Boto is a Python package that provides interfaces to Amazon Web Services.
  It supports over thirty services, such as S3 (Simple Storage Service),