[rubygem-aws/f15] Version bump

[Michal Fojtik]

commit c5b236f485a1bead0b492a35c7ea9bb92bb03086
Author: Michal Fojtik <mi at mifo.sk>
Date:   Mon Jun 20 16:24:30 2011 +0200

    Version bump

 .gitignore       |    1 +
 rubygem-aws.spec |   10 ++++++----
 sources          |   15 +--------------
 3 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ac8bf0b..a62ffb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /aws-2.4.5.gem
 /aws-2.5.1.gem
 /aws-2.5.2.gem
+/aws-2.5.5.gem
diff --git a/rubygem-aws.spec b/rubygem-aws.spec
index cc4312c..5b82c43 100644
--- a/rubygem-aws.spec
+++ b/rubygem-aws.spec
@@ -4,7 +4,7 @@
 
 Summary: Ruby gem for all Amazon Web Services
 Name: rubygem-%{gemname}
-Version: 2.5.2
+Version: 2.5.5
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -13,7 +13,7 @@ Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem
 Requires: rubygems
 Requires: ruby(abi) = 1.8
 Requires: rubygem(xml-simple)
-Requires: rubygem(right_http_connection)
+Requires: rubygem(http_connection)
 Requires: rubygem(uuidtools)
 BuildRequires: rubygems
 BuildArch: noarch
@@ -34,8 +34,6 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --no-ri --rdoc %{SOURCE0}
-# Fix typo in gemspec
-sed -i -e "s|http_connection|right_http_connection|" %{buildroot}/%{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %check
 
@@ -52,6 +50,10 @@ rm -rf %{buildroot}
 %doc %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Mon Jun 20 2011 Michal Fojtik <mfojtik at redhat.com> - 2.5.5-1
+- Replaced right_http_connection with http_connection
+- Version bump
+
 * Tue May 10 2011 Michal Fojtik <mfojtik at redhat.com> - 2.5.2-1
 - Launch instance bug fixed in this release
 - Version bump
diff --git a/sources b/sources
index 674000c..02b0a71 100644
--- a/sources
+++ b/sources
@@ -1,14 +1 @@
-8cae0a0b820a3305b3ff354385ef465d  aws-2.3.21.gem
-cbbe8fcaffbdb163806dcc8e3af201bd  rubygem-aws-fix-ruby18-compatibility.patch
-<<<<<<< HEAD
-e0f8f6833e7de229daf8cbe760e7ad24  aws-2.3.26.gem
-8213105ddc89b0a9545f10d563818065  aws-2.3.34.gem
-e6496dc8b050a6a0de9209cd6f52dbe3  aws-2.4.2.gem
-=======
-8213105ddc89b0a9545f10d563818065  aws-2.3.34.gem
-3315d4e5fd381fcfd9cb1e48c59d66c7  aws-2.4.2.gem
->>>>>>> 308e9168991967c51356d8350a8e8ed15f835495
-8d38d201ac62c2702a8c89bbd81078f4  aws-2.4.5.gem
-250632183039225df4f94dae878db66f  aws-2.5.1.gem
-c1ccedd3825c843a39c23f866e07db47  rubygem-aws.spec
-4db2fff2c004dad42df33cfe228b8a74  aws-2.5.2.gem
+ab7b62222d8f9db7be1c727ae326dcc9  aws-2.5.5.gem