diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec index 465d297..ae4a476 100644 --- a/rubygem-actionpack.spec +++ b/rubygem-actionpack.spec @@ -5,7 +5,7 @@ Summary: Web-flow and rendering framework putting the VC in MVC Name: rubygem-%{gem_name} Epoch: 1 Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: MIT URL: http://www.rubyonrails.org @@ -20,18 +20,6 @@ Source0: http://rubygems.org/downloads/actionpack-%{version}.gem Source2: actionpack-%{version}-tests.tgz # Let's keep Requires and BuildRequires sorted alphabeticaly -Requires: ruby(rubygems) -Requires: rubygem(activesupport) = %{version} -Requires: rubygem(actionview) = %{version} -Requires: rubygem(journey) >= 1.0.4 -Requires: rubygem(journey) < 1.1 -Requires: rubygem(rack) >= 1.5.2 -Requires: rubygem(rack) < 1.6 -Requires: rubygem(rack-cache) >= 1.2 -Requires: rubygem(rack-cache) < 2 -Requires: rubygem(rack-test) >= 0.6.2 -Requires: rubygem(rack-test) < 0.7 -Requires: ruby(release) BuildRequires: rubygems-devel BuildRequires: rubygem(activemodel) = %{version} BuildRequires: rubygem(activerecord) = %{version} @@ -52,7 +40,6 @@ BuildRequires: rubygem(therubyracer) BuildRequires: rubygem(tzinfo) BuildRequires: rubygem(uglifier) BuildArch: noarch -Provides: rubygem(%{gem_name}) = %{version} %description Eases web-request routing, handling, and response as a half-way front, @@ -121,7 +108,7 @@ mv test/dispatch/routing/inspector_test.rb \ # fix rack/test requirement sed -i "1i\require 'rack/test'" lib/action_controller/metal/strong_parameters.rb -ruby -w -I.:lib:test -e 'Dir.glob("test/{abstract,controller,dispatch,template}/**/*_test.rb").each {|t| require t}' +ruby -w -I.:lib:test -rtimeout -e 'Dir.glob("test/{abstract,controller,dispatch,template}/**/*_test.rb").each {|t| require t}' # activerecord tests must be run separately, otherwise we get superclass mismatch error # due to test classes that have same names in activerecord and other tests ruby -w -I.:lib:test -e 'Dir.glob("test/activerecord/**/*_test.rb").each {|t| require t}' @@ -141,6 +128,9 @@ popd %{gem_instdir}/test/ %changelog +* Fri Apr 18 2014 Josef Stribny - 1:4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.1 + * Mon Apr 14 2014 Josef Stribny - 1:4.1.0-1 - Update to ActionPack 4.1.0