From 917c8be4b1b24b5c7fa4bd162d03e3f61241f2fb Mon Sep 17 00:00:00 2001 From: Josef Stribny Date: Thu, 25 Jul 2013 13:11:20 +0200 Subject: [PATCH] Update to rack 1.5.2 --- .gitignore | 1 + rubygem-rack-1.5.0-Fix-Ruby-2.0-build.patch | 25 --------------------- rubygem-rack.spec | 18 ++++++--------- sources | 2 +- 4 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 rubygem-rack-1.5.0-Fix-Ruby-2.0-build.patch diff --git a/.gitignore b/.gitignore index fde71cd..f9207cc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ rack-1.1.0.gem /rack-1.4.1.gem /rack-1.4.4.gem /rack-1.4.5.gem +/rack-1.5.2.gem diff --git a/rubygem-rack-1.5.0-Fix-Ruby-2.0-build.patch b/rubygem-rack-1.5.0-Fix-Ruby-2.0-build.patch deleted file mode 100644 index 7ebc58e..0000000 --- a/rubygem-rack-1.5.0-Fix-Ruby-2.0-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0a74380d2e5157d94c7e9141242af33e5c0bf951 Mon Sep 17 00:00:00 2001 -From: Santiago Pastorino -Date: Sat, 29 Dec 2012 17:36:08 -0200 -Subject: [PATCH] Fix Ruby 2.0 build - ---- - test/spec_chunked.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/spec_chunked.rb b/test/spec_chunked.rb -index c81409f..12f2158 100644 ---- a/test/spec_chunked.rb -+++ b/test/spec_chunked.rb -@@ -41,7 +41,7 @@ describe Rack::Chunked do - response.headers.should.not.include 'Content-Length' - response.headers['Transfer-Encoding'].should.equal 'chunked' - response.body.encoding.to_s.should.equal "ASCII-8BIT" -- response.body.should.equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n" -+ response.body.should.equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n".force_encoding("BINARY") - end if RUBY_VERSION >= "1.9" - - should 'not modify response when Content-Length header present' do --- -1.8.1.2 - diff --git a/rubygem-rack.spec b/rubygem-rack.spec index 024a841..4fd51b1 100644 --- a/rubygem-rack.spec +++ b/rubygem-rack.spec @@ -1,21 +1,18 @@ %global gem_name rack # There is circular dependency between thin and rack. -%global bootstrap_thin 0 +%global bootstrap_thin 1 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.4.5 -Release: 3%{?dist} +Version: 1.5.2 +Release: 1%{?dist} Group: Development/Languages License: MIT URL: http://rubyforge.org/projects/%{gem_name}/ Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem -# Fix test suite for Ruby 2.0 -# https://github.com/rack/rack/commit/0a74380d2e5157d94c7e9141242af33e5c0bf951 -Patch0: rubygem-rack-1.5.0-Fix-Ruby-2.0-build.patch Requires: ruby(rubygems) Requires: ruby(release) BuildRequires: ruby @@ -50,10 +47,6 @@ Documentation for %{name} %setup -q -c -T %gem_install -n %{SOURCE0} -pushd .%{gem_instdir} -%patch0 -p1 -popd - %build %install @@ -85,7 +78,7 @@ pushd .%{gem_instdir} PID=%(mktemp) memcached -d -P "$PID" -bacon --automatic --quiet +bacon -Ilib --automatic --quiet # Kill memcached daemon. kill -TERM $(< "$PID") @@ -114,6 +107,9 @@ popd %changelog +* Wed Jul 24 2013 Josef Stribny - 1:1.5.2-1 +- Update to rack 1.5.2 + * Fri Mar 01 2013 Vít Ondruch - 1:1.4.5-3 - Enable thin test suite. diff --git a/sources b/sources index e6a0591..92f8574 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6661d225210f6b48f83fb279aba0a149 rack-1.4.5.gem +02067ea717f5d2e4b8e0bcd5155fcbc5 rack-1.5.2.gem