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

[gholms]

commit a1721f90ed9e8f6b2ac3cf85a9b1cfd2add89da2
Merge: 148afd6 d455c18
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed Jun 13 17:04:33 2012 -0700

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

 .gitignore                      |    4 +-
 python-boto-1.9b-image.patch    |   42 -------------
 python-boto-1.9b-prefix.patch   |   15 -----
 python-boto-1.9b-python24.patch |  121 ---------------------------------------
 python-boto-1.9b-python27.patch |   27 ---------
 python26-boto.spec              |   21 ++++++-
 sources                         |    2 +-
 7 files changed, 20 insertions(+), 212 deletions(-)
---
diff --cc python26-boto.spec
index e74b7a1,ac43a5a..46a82b6
--- a/python26-boto.spec
+++ b/python26-boto.spec
@@@ -8,15 -2,14 +8,15 @@@
  %global pkgname boto
  
  Summary:	A simple lightweight interface to Amazon Web Services
 -Name:		python-boto
 +Name:		python%{__python_ver}-boto
- Version:	2.0
+ Version:	2.5.0
  Release:	1%{?dist}
  License:	MIT
  Group:		Development/Languages
- URL:		http://code.google.com/p/%{pkgname}/
- Source:		http://boto.googlecode.com/files/%{pkgname}-%{version}.tar.gz
+ URL:		https://github.com/%{pkgname}/%{pkgname}
+ Source:		http://pypi.python.org/packages/source/b/%{pkgname}/%{pkgname}-%{version}.tar.gz
 -BuildRequires:	python-devel >= 2.5, python-setuptools-devel
 +Requires:	python%{?__python_ver}
 +BuildRequires:	python%{?__python_ver}-devel, python%{?__python_ver}-setuptools
  BuildArch:	noarch
  BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
@@@ -48,16 -38,39 +48,31 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitelib}/*
  
  %changelog
+ * Wed Jun 13 2012 Garrett Holmstrom <gholms at fedoraproject.org> - 2.5.0-1
+ - Updated to 2.5.0 (#828912)
+ 
+ * Wed Mar 21 2012 Robert Scheck <robert at fedoraproject.org> 2.3.0-1
+ - Upgrade to 2.3.0 (#786301 #c10)
+ 
+ * Tue Mar 13 2012 Robert Scheck <robert at fedoraproject.org> 2.2.2-1
+ - Upgrade to 2.2.2 (#786301, thanks to Bobby Powers)
+ 
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Mon Aug 15 2011 Robert Scheck <robert at fedoraproject.org> 2.0-1
+ - Upgrade to 2.0 (#723088)
+ 
 +* Mon Jul 18 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 2.0-1
 +- Updated to 2.0 final
 +- Added an explicit python dependency
 +
 +* Fri Mar 04 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 2.0-0.1.b4
 +- Update to 2.0 beta 4
 +
 +* Fri Mar 04 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.9b-7
 +- Forked python26-boto for el5 from Fedora's python-boto-1.9b-7
 +
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9b-7
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
  
diff --cc sources
index 1836b6f,4b20aee..648b554
--- a/sources
+++ b/sources
@@@ -1,1 -1,2 +1,1 @@@
- e238262c5ff417a2b59a8b24ae06b9ce  boto-2.0.tar.gz
 -9c8c3ea67a58021c95609d4cc3a08e54  boto-2.3.0.tar.gz
+ 821670807cfa3f3569b0ec5ee3c49f5f  boto-2.5.0.tar.gz