From 72d5aade30928a1441244d111d93f6142f60f94d Mon Sep 17 00:00:00 2001
From: Jun Aruga <jaruga@redhat.com>
Date: Mon, 2 May 2016 14:34:54 +0200
Subject: [PATCH] - Update to 1.6.4. - Fix test suite for FTBFS (rhbz#1308069).

---
 .gitignore                        |  1 +
 rubygem-rack-1.6.4-fix-test.patch | 28 ++++++++++++++++++++++++++++
 rubygem-rack.spec                 | 12 ++++++++++--
 sources                           |  2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 rubygem-rack-1.6.4-fix-test.patch

diff --git a/.gitignore b/.gitignore
index 82e666c..4664dcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ rack-1.1.0.gem
 /rack-1.6.0.gem
 /rack-1.6.1.gem
 /rack-1.6.2.gem
+/rack-1.6.4.gem
diff --git a/rubygem-rack-1.6.4-fix-test.patch b/rubygem-rack-1.6.4-fix-test.patch
new file mode 100644
index 0000000..479e39c
--- /dev/null
+++ b/rubygem-rack-1.6.4-fix-test.patch
@@ -0,0 +1,28 @@
+From 221d4fd13b7986cfea37222111dd0f6b595465b3 Mon Sep 17 00:00:00 2001
+From: Ryan Davis <ryand-ruby@zenspider.com>
+Date: Wed, 10 Jun 2015 15:45:03 -0700
+Subject: [PATCH] Make all tests run and pass independently.
+
+---
+ test/spec_cascade.rb  | 1 +
+ test/spec_response.rb | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/test/spec_cascade.rb b/test/spec_cascade.rb
+index 38a18da..4c67cfb 100644
+--- a/test/spec_cascade.rb
++++ b/test/spec_cascade.rb
+@@ -1,3 +1,4 @@
++require 'rack'
+ require 'rack/cascade'
+ require 'rack/file'
+ require 'rack/lint'
+diff --git a/test/spec_response.rb b/test/spec_response.rb
+index 20a2d0c..f4ff5e8 100644
+--- a/test/spec_response.rb
++++ b/test/spec_response.rb
+@@ -1,3 +1,4 @@
++require 'rack'
+ require 'rack/response'
+ require 'stringio'
+ 
diff --git a/rubygem-rack.spec b/rubygem-rack.spec
index 2592d81..61b1b87 100644
--- a/rubygem-rack.spec
+++ b/rubygem-rack.spec
@@ -15,14 +15,17 @@ Name:           rubygem-%{gem_name}
 Summary:        Common API for connecting web frameworks, web servers and layers of software
 # Introduce Epoch (related to bug 552972)
 Epoch:          1
-Version:        1.6.2
-Release:        2%{?dist}
+Version:        1.6.4
+Release:        1%{?dist}
 Group:          Development/Languages
 # lib/rack/backports/uri/* are taken from Ruby which is (Ruby or BSD)
 # lib/rack/show{status,exceptions}.rb contains snippets from Django under BSD license.
 License:        MIT and (Ruby or BSD) and BSD
 URL:            http://rack.github.io/
 Source0:        https://rubygems.org/gems/%{gem_name}-%{version}.gem
+# Fix test suite on version 1.6.4
+# https://github.com/rack/rack/commit/221d4fd.patch
+Patch0: rubygem-rack-1.6.4-fix-test.patch
 %if 0%{?fc20} || 0%{?el6} || 0%{?el7}
 Requires:       ruby(rubygems)
 Requires:       ruby(release)
@@ -99,6 +102,7 @@ pushd .%{gem_instdir}
 PID=%(mktemp)
 memcached -d -P "$PID"
 
+patch -p1 < %{PATCH0}
 bacon -Ilib --automatic --quiet
 
 # Kill memcached daemon.
@@ -129,6 +133,10 @@ popd
 %doc %{gem_instdir}/contrib
 
 %changelog
+* Mon May 02 2016 Jun Aruga <jaruga@redhat.com> - 1:1.6.4-1
+- Update to 1.6.4.
+- Fix test suite for FTBFS (rhbz#1308069).
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index a64fb6c..3f41b76 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6efe19e34f6bc50e7347714c99999fd4  rack-1.6.2.gem
+7f11121a95fe4e59cd86af2b791a3590  rack-1.6.4.gem