Update to the ActionPack 3.2.10.

6 files changed, 63 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index a423a15..488811d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ actionpack-2.3.8.gem
 /actionpack-3.2.7.gem
 /actionpack-3.2.8-tests.tgz
 /actionpack-3.2.8.gem
+/actionpack-3.2.10-tests.tgz
+/actionpack-3.2.10.gem
diff --git a/rubygem-actionpack-3.2.8-relax-builder-dependency.patch b/rubygem-actionpack-3.2.8-relax-builder-dependency.patch
index 01977e6..604f997 100644
--- a/rubygem-actionpack-3.2.8-relax-builder-dependency.patch
+++ b/rubygem-actionpack-3.2.8-relax-builder-dependency.patch
@@ -1,8 +1,8 @@
---- a/specifications/actionpack-3.2.8.gemspec
-+++ b/specifications/actionpack-3.2.8.gemspec
+--- a/specifications/actionpack-3.2.10.gemspec
++++ b/specifications/actionpack-3.2.10.gemspec
 @@ -23,7 +23,7 @@
-       s.add_runtime_dependency(%q<activesupport>, ["= 3.2.8"])
-       s.add_runtime_dependency(%q<activemodel>, ["= 3.2.8"])
+       s.add_runtime_dependency(%q<activesupport>, ["= 3.2.10"])
+       s.add_runtime_dependency(%q<activemodel>, ["= 3.2.10"])
        s.add_runtime_dependency(%q<rack-cache>, ["~> 1.2"])
 -      s.add_runtime_dependency(%q<builder>, ["~> 3.0.0"])
 +      s.add_runtime_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
@@ -10,8 +10,8 @@
        s.add_runtime_dependency(%q<rack-test>, ["~> 0.6.1"])
        s.add_runtime_dependency(%q<journey>, ["~> 1.0.4"])
 @@ -34,7 +34,7 @@
-       s.add_dependency(%q<activesupport>, ["= 3.2.8"])
-       s.add_dependency(%q<activemodel>, ["= 3.2.8"])
+       s.add_dependency(%q<activesupport>, ["= 3.2.10"])
+       s.add_dependency(%q<activemodel>, ["= 3.2.10"])
        s.add_dependency(%q<rack-cache>, ["~> 1.2"])
 -      s.add_dependency(%q<builder>, ["~> 3.0.0"])
 +      s.add_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
@@ -19,8 +19,8 @@
        s.add_dependency(%q<rack-test>, ["~> 0.6.1"])
        s.add_dependency(%q<journey>, ["~> 1.0.4"])
 @@ -46,7 +46,7 @@
-     s.add_dependency(%q<activesupport>, ["= 3.2.8"])
-     s.add_dependency(%q<activemodel>, ["= 3.2.8"])
+     s.add_dependency(%q<activesupport>, ["= 3.2.10"])
+     s.add_dependency(%q<activemodel>, ["= 3.2.10"])
      s.add_dependency(%q<rack-cache>, ["~> 1.2"])
 -    s.add_dependency(%q<builder>, ["~> 3.0.0"])
 +    s.add_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
diff --git a/rubygem-actionpack-4.0.0-change-spy-of-after-invoked-controller-action.-becau.patch b/rubygem-actionpack-4.0.0-change-spy-of-after-invoked-controller-action.-becau.patch
new file mode 100644
index 0000000..8cf1660
--- /dev/null
+++ b/rubygem-actionpack-4.0.0-change-spy-of-after-invoked-controller-action.-becau.patch
@@ -0,0 +1,30 @@
+From 4f0f1b5d5249e05fa173b296af2ec6f6e4f78d33 Mon Sep 17 00:00:00 2001
+From: SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+Date: Thu, 20 Dec 2012 16:49:00 +0900
+Subject: [PATCH] change spy of  after invoked controller action. because
+ ruby-2.0.0 waned unused variables
+
+---
+ actionpack/test/controller/render_test.rb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
+index 7640bc1..6d91415 100644
+--- a/actionpack/test/controller/render_test.rb
++++ b/actionpack/test/controller/render_test.rb
+@@ -1433,10 +1433,11 @@ class RenderTest < ActionController::TestCase
+   end
+ 
+   def test_locals_option_to_assert_template_is_not_supported
++    get :partial_collection_with_locals
++
+     warning_buffer = StringIO.new
+     $stderr = warning_buffer
+ 
+-    get :partial_collection_with_locals
+     assert_template :partial => 'customer_greeting', :locals => { :greeting => 'Bonjour' }
+     assert_equal "the :locals option to #assert_template is only supported in a ActionView::TestCase\n", warning_buffer.string
+   ensure
+-- 
+1.8.0.1
+
diff --git a/rubygem-actionpack-relax-sprockets-dependency.patch b/rubygem-actionpack-relax-sprockets-dependency.patch
index f968a1d..8ef6ebc 100644
--- a/rubygem-actionpack-relax-sprockets-dependency.patch
+++ b/rubygem-actionpack-relax-sprockets-dependency.patch
@@ -1,11 +1,11 @@
---- specifications/actionpack-3.2.8.gemspec.old	2012-07-20 12:06:27.000000000 +0200
-+++ specifications/actionpack-3.2.8.gemspec	2012-07-20 12:44:09.491547387 +0200
+--- specifications/actionpack-3.2.10.gemspec.old	2012-07-20 12:06:27.000000000 +0200
++++ specifications/actionpack-3.2.10.gemspec	2012-07-20 12:44:09.491547387 +0200
 @@ -27,7 +27,7 @@
        s.add_runtime_dependency(%q<rack>, ["~> 1.4.0"])
        s.add_runtime_dependency(%q<rack-test>, ["~> 0.6.1"])
        s.add_runtime_dependency(%q<journey>, ["~> 1.0.4"])
--      s.add_runtime_dependency(%q<sprockets>, ["~> 2.1.3"])
-+      s.add_runtime_dependency(%q<sprockets>, [">= 2.1.3"])
+-      s.add_runtime_dependency(%q<sprockets>, ["~> 2.2.1"])
++      s.add_runtime_dependency(%q<sprockets>, [">= 2.2.1"])
        s.add_runtime_dependency(%q<erubis>, ["~> 2.7.0"])
        s.add_development_dependency(%q<tzinfo>, ["~> 0.3.29"])
      else
@@ -13,8 +13,8 @@
        s.add_dependency(%q<rack>, ["~> 1.4.0"])
        s.add_dependency(%q<rack-test>, ["~> 0.6.1"])
        s.add_dependency(%q<journey>, ["~> 1.0.4"])
--      s.add_dependency(%q<sprockets>, ["~> 2.1.3"])
-+      s.add_dependency(%q<sprockets>, [">= 2.1.3"])
+-      s.add_dependency(%q<sprockets>, ["~> 2.2.1"])
++      s.add_dependency(%q<sprockets>, [">= 2.2.1"])
        s.add_dependency(%q<erubis>, ["~> 2.7.0"])
        s.add_dependency(%q<tzinfo>, ["~> 0.3.29"])
      end
@@ -22,8 +22,8 @@
      s.add_dependency(%q<rack>, ["~> 1.4.0"])
      s.add_dependency(%q<rack-test>, ["~> 0.6.1"])
      s.add_dependency(%q<journey>, ["~> 1.0.4"])
--    s.add_dependency(%q<sprockets>, ["~> 2.1.3"])
-+    s.add_dependency(%q<sprockets>, [">= 2.1.3"])
+-    s.add_dependency(%q<sprockets>, ["~> 2.2.1"])
++    s.add_dependency(%q<sprockets>, [">= 2.2.1"])
      s.add_dependency(%q<erubis>, ["~> 2.7.0"])
      s.add_dependency(%q<tzinfo>, ["~> 0.3.29"])
    end
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index 6b1f212..b5893d8 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -6,8 +6,8 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gem_name}
 Epoch: 1
-Version: 3.2.8
-Release: 2%{?dist}
+Version: 3.2.10
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -17,13 +17,16 @@ 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.8
-# tar czvf actionpack-3.2.8-tests.tgz test/
+# git checkout v3.2.10
+# tar czvf actionpack-3.2.10-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
+# Fixes "warning: assigned but unused variable - customer_greeting_counter" warning.
+# https://github.com/rails/rails/pull/8546
+Patch3: rubygem-actionpack-4.0.0-change-spy-of-after-invoked-controller-action.-becau.patch
 
 # Let's keep Requires and BuildRequires sorted alphabeticaly
 Requires: ruby(rubygems)
@@ -93,6 +96,7 @@ tar xzvf %{SOURCE2} -C .%{gem_instdir}
 
 pushd .%{gem_instdir}
 %patch0 -p0
+%patch3 -p2
 popd
 
 pushd .%{gem_dir}
@@ -159,6 +163,9 @@ popd
 %{gem_instdir}/test/
 
 %changelog
+* Thu Jan 03 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.10-1
+- Update to the ActionPack 3.2.10.
+
 * Sat Oct 13 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.2.8-2
 - Relaxed Builder dependency.
 
@@ -174,7 +181,7 @@ popd
 * Tue Jul 24 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.2.6-2
 - Fixed missing epoch in -doc subpackage.
 
-* Thu Jul 23 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.2.6-1
+* Mon Jul 23 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.2.6-1
 - Updated to the ActionPack 3.2.6.
 - Remove Rake dependency.
 - Introduce -doc subpackage.
@@ -292,7 +299,7 @@ popd
 * Thu Nov 29 2007 David Lutterkort <dlutter@redhat.com> - 1.13.6-1
 - New version
 
-* Tue Nov 14 2007 David Lutterkort <dlutter@redhat.com> - 1.13.5-2
+* Tue Nov 13 2007 David Lutterkort <dlutter@redhat.com> - 1.13.5-2
 - Fix buildroot; mark docs in geminstdir cleanly
 
 * Tue Oct 30 2007 David Lutterkort <dlutter@redhat.com> - 1.13.5-1
diff --git a/sources b/sources
index dd358dc..e66fc56 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e37554fb1f613f0958b9413caf6806d7  actionpack-3.2.8-tests.tgz
-0ace7e6119cd5edcfc9cd66b5fd791ee  actionpack-3.2.8.gem
+2edc5cb98c824ebce90142cf870bc20b  actionpack-3.2.10-tests.tgz
+05cd481ea5fb33b0d0153c949d9f2f15  actionpack-3.2.10.gem