From 0e0916b2b25972abc2d2bb6ca6d77fa11637ebee Mon Sep 17 00:00:00 2001
From: Shawn Starr <shawn.starr@rogers.com>
Date: Fri, 24 Aug 2012 21:50:27 -0400
Subject: [PATCH] Update to latest upstream

---
 .gitignore               |  2 +-
 rubygem-addressable.spec | 17 +++++++++++++----
 sources                  |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 413aa03..12b9c4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/addressable-2.2.6.gem
+/addressable-2.3.2.gem
diff --git a/rubygem-addressable.spec b/rubygem-addressable.spec
index 6ad0ee1..4c64ff9 100644
--- a/rubygem-addressable.spec
+++ b/rubygem-addressable.spec
@@ -3,8 +3,8 @@
 
 Summary: Improved URI/URL Implementation
 Name: rubygem-%{gem_name}
-Version: 2.2.6
-Release: 4%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
 Group: Development/Languages
 License: ASL 2.0
 URL: http://addressable.rubyforge.org/
@@ -57,6 +57,9 @@ find .%{gem_instdir}/{Rakefile,lib,spec} -type f | \
 find .%{gem_instdir}/{Rakefile,lib,spec} -type f | \
   xargs chmod 0644
 
+# Fix conflict causing spec test failure
+sed -i -e 's#^\([[:blank:]]*class\)[[:blank:]]HTTP*$#\1 AddressableHTTP#' -e 's#URI::HTTP#URI::AddressableHTTP#' .%{gem_instdir}/spec/addressable/uri_spec.rb
+
 %check
 pushd .%{gem_instdir}
 
@@ -66,21 +69,27 @@ popd
 
 %files
 %dir %{gem_instdir}/
-%doc %{gem_instdir}/CHANGELOG
-%doc %{gem_instdir}/LICENSE
+%doc %{gem_instdir}/CHANGELOG.md
+%doc %{gem_instdir}/LICENSE.txt
 %{gem_instdir}/lib/
+%{gem_instdir}/data/
 %{gem_spec}
 %exclude %{gem_cache}
 
 %files doc
 %doc %{gem_instdir}/README.md
 %doc %{gem_instdir}/website
+%{gem_instdir}/Gemfile
 %{gem_instdir}/Rakefile
 %{gem_instdir}/tasks
 %{gem_instdir}/spec
 %{gem_docdir}
 
 %changelog
+* Thu Aug 23 2012 Shawn Starr <shawn.starr@rogers.com> - 2.3.2-1
+- Bump to latest upstream
+- Fix spec test due to namespace/classname conflict
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index ddb22c5..6a8c1a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3eec7c544b664f28023ff5d7fb0116ef  addressable-2.2.6.gem
+0e0c0a0eeebd668287d1a43cd8db18bd  addressable-2.3.2.gem