[rubygem-actionpack] Update to ActionPack 4.0.0

[Josef Stribny]

commit a1ef8448e954d7c4696e54fa3873dd16fe618d30
Author: Josef Stribny <jstribny at redhat.com>
Date:   Thu Aug 8 14:44:23 2013 +0200

    Update to ActionPack 4.0.0

 .gitignore                                         |    2 +
 ...actionpack-3.2.8-relax-builder-dependency.patch |   30 --------------
 rubygem-actionpack-enable-test.patch               |    2 +-
 ...gem-actionpack-relax-sprockets-dependency.patch |   29 -------------
 rubygem-actionpack.spec                            |   43 ++++++++++----------
 sources                                            |    4 +-
 6 files changed, 27 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fcb78ef..a76a2b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ actionpack-2.3.8.gem
 /actionpack-3.2.12.gem
 /actionpack-3.2.13-tests.tgz
 /actionpack-3.2.13.gem
+/actionpack-4.0.0-tests.tgz
+/actionpack-4.0.0.gem
diff --git a/rubygem-actionpack-enable-test.patch b/rubygem-actionpack-enable-test.patch
index d620f83..a34c678 100644
--- a/rubygem-actionpack-enable-test.patch
+++ b/rubygem-actionpack-enable-test.patch
@@ -2,7 +2,7 @@
 +++ test/active_record_unit.rb	2011-01-11 00:09:09.152505905 -0500
 @@ -13,12 +13,12 @@ end
  # Try to grab AR
- unless defined?(ActiveRecord) && defined?(Fixtures)
+ unless defined?(ActiveRecord) && defined?(FixtureSet)
    begin
 -    PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
 -    raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index c417267..3515091 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -5,8 +5,8 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gem_name}
 Epoch: 1
-Version: 3.2.13
-Release: 3%{?dist}
+Version: 4.0.0
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -16,31 +16,27 @@ Source0: http://rubygems.org/downloads/actionpack-%{version}.gem
 # You may check it out like so
 # git clone http://github.com/rails/rails.git
 # cd rails/actionpack/
-# git checkout v3.2.13
-# tar czvf actionpack-3.2.13-tests.tgz test/
+# git checkout v4.0.0
+# tar czvf actionpack-4.0.0-tests.tgz test/
 Source2: actionpack-%{version}-tests.tgz
-
 Patch0: rubygem-actionpack-enable-test.patch
-Patch1: rubygem-actionpack-relax-sprockets-dependency.patch
-Patch2: rubygem-actionpack-3.2.8-relax-builder-dependency.patch
 
 # Let's keep Requires and BuildRequires sorted alphabeticaly
 Requires: ruby(rubygems)
 Requires: rubygem(activemodel) = %{version}
 Requires: rubygem(activesupport) = %{version}
-Requires: rubygem(builder) >= 3.0.0
+Requires: rubygem(builder) >= 3.1.0
 Requires: rubygem(builder) < 3.2
 Requires: rubygem(erubis) >= 2.7.0
 Requires: rubygem(erubis) < 2.8
 Requires: rubygem(journey) >= 1.0.4
 Requires: rubygem(journey) < 1.1
-Requires: rubygem(rack) >= 1.4.0
-Requires: rubygem(rack) < 1.5
+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.1
+Requires: rubygem(rack-test) >= 0.6.2
 Requires: rubygem(rack-test) < 0.7
-Requires: rubygem(sprockets) >= 2.1.3
 Requires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: rubygem(activemodel) = %{version}
@@ -52,13 +48,12 @@ BuildRequires: rubygem(journey) >= 1.0.4
 BuildRequires: rubygem(journey) < 1.1
 BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(mocha) >= 0.9.8
-BuildRequires: rubygem(rack) >= 1.4.0
-BuildRequires: rubygem(rack) < 1.5
+BuildRequires: rubygem(rack) >= 1.5.2
+BuildRequires: rubygem(rack) < 1.6
 BuildRequires: rubygem(rack-cache) >= 1.2
 BuildRequires: rubygem(rack-cache) < 2
-BuildRequires: rubygem(rack-test) >= 0.6.1
+BuildRequires: rubygem(rack-test) >= 0.6.2
 BuildRequires: rubygem(rack-test) < 0.7
-BuildRequires: rubygem(sprockets) >= 2.1.3
 BuildRequires: rubygem(sqlite3)
 BuildRequires: rubygem(therubyracer)
 BuildRequires: rubygem(tzinfo) >= 0.3.29
@@ -91,11 +86,6 @@ pushd .%{gem_instdir}
 %patch0 -p0
 popd
 
-pushd .%{gem_dir}
-%patch1 -p0
-%patch2 -p1
-popd
-
 # Remove backup files
 # No! these are needed for rake test
 # find ./%{gem_instdir} -type f -name "*~" -delete
@@ -135,6 +125,14 @@ sed -i '1,2d' test/abstract_unit.rb
 mv test/controller/assert_select_test.rb \
             test/controller/assert_select_test.rb.skip
 
+# dependency loop
+# depends on rails/engine from Railties
+mv test/dispatch/routing/inspector_test.rb \
+            test/dispatch/routing/inspector_test.rb.skip
+
+# 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}'
 # 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
@@ -155,6 +153,9 @@ popd
 %{gem_instdir}/test/
 
 %changelog
+* Thu Aug 08 2013 Josef Stribny <jstribny at redhat.com> - 1:4.0.0-1
+- Update to ActionPack 4.0.0.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.2.13-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index b583031..a1204a5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-959450fbb7a60f35f94d63add43eb272  actionpack-3.2.13-tests.tgz
-2c6815711d20e0989ed3145088aa040b  actionpack-3.2.13.gem
+26b27750385c80416a50db7a1864db64  actionpack-4.0.0-tests.tgz
+b9511c7c31fba41f5e9121c1badedeb8  actionpack-4.0.0.gem