From 20395173620e605f8ccdb55d388ac68edf15fe24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 26 Jul 2016 17:10:47 +0200 Subject: [PATCH] Update to Rack 2.0.1. --- .gitignore | 1 + rubygem-rack-1.6.4-fix-test.patch | 28 ----------- rubygem-rack.spec | 81 +++++++++++-------------------- sources | 2 +- 4 files changed, 31 insertions(+), 81 deletions(-) delete mode 100644 rubygem-rack-1.6.4-fix-test.patch diff --git a/.gitignore b/.gitignore index 4664dcb..4f50301 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ rack-1.1.0.gem /rack-1.6.1.gem /rack-1.6.2.gem /rack-1.6.4.gem +/rack-2.0.1.gem diff --git a/rubygem-rack-1.6.4-fix-test.patch b/rubygem-rack-1.6.4-fix-test.patch deleted file mode 100644 index 479e39c..0000000 --- a/rubygem-rack-1.6.4-fix-test.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 221d4fd13b7986cfea37222111dd0f6b595465b3 Mon Sep 17 00:00:00 2001 -From: Ryan Davis -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 61b1b87..0239bfb 100644 --- a/rubygem-rack.spec +++ b/rubygem-rack.spec @@ -1,53 +1,31 @@ %global gem_name rack # There is circular dependency between thin and rack. -%global bootstrap_thin 0 - -# rubygem-bacon missing for epel7 -# https://bugzilla.redhat.com/show_bug.cgi?id=1138661 -%if 0%{?el7} -%global enable_checks 0 -%else -%global enable_checks 1 -%endif +# Set this to 0 after we've bootstrapped. +%{!?_with_bootstrap: %global bootstrap 0} -Name: rubygem-%{gem_name} -Summary: Common API for connecting web frameworks, web servers and layers of software +Name: rubygem-%{gem_name} +Version: 2.0.1 # Introduce Epoch (related to bug 552972) -Epoch: 1 -Version: 1.6.4 -Release: 1%{?dist} -Group: Development/Languages -# lib/rack/backports/uri/* are taken from Ruby which is (Ruby or BSD) +Epoch: 1 +Release: 1%{?dist} +Summary: A modular Ruby webserver interface +Group: Development/Languages # 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) -%endif -BuildRequires: ruby -BuildRequires: rubygems-devel -%if 0%{?enable_checks} -BuildRequires: rubygem(bacon) -BuildRequires: memcached -BuildRequires: rubygem(memcache-client) -%endif -%if 0%{bootstrap_thin} < 1 -BuildRequires: rubygem(thin) +License: MIT and BSD +URL: http://rack.github.io/ +Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem +BuildRequires: ruby(release) +BuildRequires: rubygems-devel +BuildRequires: ruby >= 2.2.2 +BuildRequires: rubygem(concurrent-ruby) +BuildRequires: memcached +BuildRequires: rubygem(memcache-client) +BuildRequires: rubygem(minitest) +%if ! 0%{?bootstrap} +BuildRequires: rubygem(thin) %endif -# Seems that lighttpd test depends on rubygem(fcgi), which is not in Fedora, -# if it will ever be. -#BuildRequires: lighttpd-fastcgi -BuildArch: noarch -%if 0%{?fc20} || 0%{?el6} || 0%{?el7} -Provides: rubygem(%{gem_name}) = %{version} -%endif -Provides: bundled(okjson) = 20150104 +BuildArch: noarch %description Rack provides a minimal, modular and adaptable interface for developing @@ -64,7 +42,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} BuildArch: noarch %description doc -Documentation for %{name} +Documentation for %{name}. %prep %setup -q -c -T @@ -73,11 +51,11 @@ Documentation for %{name} %build %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{gem_dir} cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ + mkdir -p %{buildroot}%{_bindir} cp -pa .%{_bindir}/* \ %{buildroot}%{_bindir}/ @@ -94,7 +72,6 @@ for file in `find %{buildroot}%{gem_instdir} -type f`; do [ ! -z "`head -n 1 $file | grep \"^#!\"`" ] && chmod -v 755 $file done -%if 0%{?enable_checks} %check pushd .%{gem_instdir} @@ -102,29 +79,26 @@ pushd .%{gem_instdir} PID=%(mktemp) memcached -d -P "$PID" -patch -p1 < %{PATCH0} -bacon -Ilib --automatic --quiet +ruby -Ilib:test -e 'Dir.glob "./test/spec_*.rb", &method(:require)' # Kill memcached daemon. kill -TERM $(< "$PID") popd -%endif #end of checks. %files %dir %{gem_instdir} +%{_bindir}/rackup %license %{gem_instdir}/COPYING %{gem_libdir} %{gem_instdir}/bin -%{_bindir}/rackup %exclude %{gem_cache} %{gem_spec} %files doc %doc %{gem_docdir} -%doc %{gem_instdir}/README.rdoc -%doc %{gem_instdir}/KNOWN-ISSUES %doc %{gem_instdir}/HISTORY.md +%doc %{gem_instdir}/README.rdoc %{gem_instdir}/%{gem_name}.gemspec %{gem_instdir}/Rakefile %{gem_instdir}/SPEC @@ -133,6 +107,9 @@ popd %doc %{gem_instdir}/contrib %changelog +* Fri Jul 01 2016 Vít Ondruch - 1:2.0.1-1 +- Update to Rack 2.0.1. + * Mon May 02 2016 Jun Aruga - 1:1.6.4-1 - Update to 1.6.4. - Fix test suite for FTBFS (rhbz#1308069). diff --git a/sources b/sources index 3f41b76..8bed228 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f11121a95fe4e59cd86af2b791a3590 rack-1.6.4.gem +ef209944508b4b1901840682b835c573 rack-2.0.1.gem