From d2856364920bef7872d55d501e5531fbf596d952 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen <kanarip@fedoraproject.org>
Date: Oct 21 2009 14:36:10 +0000
Subject: 2.3.2-3


---

diff --git a/import.log b/import.log
index ffa30eb..37eb6c3 100644
--- a/import.log
+++ b/import.log
@@ -1,2 +1,3 @@
 rubygem-actionpack-2_3_2-1_fc10:HEAD:rubygem-actionpack-2.3.2-1.fc10.src.rpm:1237201627
 rubygem-actionpack-2_3_3-1_fc11:F-11:rubygem-actionpack-2.3.3-1.fc11.src.rpm:1248815949
+rubygem-actionpack-2_3_2-3_fc12:F-11:rubygem-actionpack-2.3.2-3.fc12.src.rpm:1256135754
diff --git a/rubygem-actionpack-2.3.2-fix-reset_session.patch b/rubygem-actionpack-2.3.2-fix-reset_session.patch
new file mode 100644
index 0000000..04839f0
--- /dev/null
+++ b/rubygem-actionpack-2.3.2-fix-reset_session.patch
@@ -0,0 +1,31 @@
+commit 01478e930c124db4bbbc70df17343848b0e70a7d
+Author: Joshua Peek <josh@joshpeek.com>
+Date:   Sun May 17 14:44:19 2009 -0500
+
+    Fix reset_session with ActiveRecord store [#2200 state:resolved]
+
+diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
+index c98892e..bde36eb 100644
+--- a/actionpack/test/activerecord/active_record_store_test.rb
++++ b/actionpack/test/activerecord/active_record_store_test.rb
+@@ -27,9 +27,9 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
+     end
+ 
+     def call_reset_session
+-      session[:bar]
++      session[:foo]
+       reset_session
+-      session[:bar] = "baz"
++      session[:foo] = "baz"
+       head :ok
+     end
+ 
+@@ -86,7 +86,7 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
+ 
+       get '/get_session_value'
+       assert_response :success
+-      assert_equal 'foo: nil', response.body
++      assert_equal 'foo: "baz"', response.body
+ 
+       get '/get_session_id'
+       assert_response :success
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index 78cf428..e811807 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -4,29 +4,31 @@
 %define gemname actionpack
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-Summary: Web-flow and rendering framework putting the VC in MVC
-Name: rubygem-%{gemname}
-Epoch: 1
-Version: 2.3.2
-Release: 2%{?dist}
-Group: Development/Languages
-License: MIT
-URL: http://www.rubyonrails.org
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0:  rubygem-actionpack-2.3.x-CVE-2009-3009.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
-Requires: rubygem(activesupport) = %{version}
-BuildRequires: rubygems
-BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Summary:        Web-flow and rendering framework putting the VC in MVC
+Name:           rubygem-%{gemname}
+Epoch:          1
+Version:        2.3.2
+Release:        3%{?dist}
+Group:          Development/Languages
+License:        MIT
+URL:            http://www.rubyonrails.org
+Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0:         rubygem-actionpack-2.3.x-CVE-2009-3009.patch
+# Ticket #2200 upstream. see also:
+# https://rails.lighthouseapp.com/projects/8994/tickets/2200-session-support-broken#ticket-2200-23
+Patch1:         rubygem-actionpack-2.3.2-fix-reset_session.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       rubygems
+Requires:       rubygem(activesupport) = %{version}
+BuildRequires:  rubygems
+BuildArch:      noarch
+Provides:       rubygem(%{gemname}) = %{version}
 
 %description
 Eases web-request routing, handling, and response as a half-way front,
 half-way page controller. Implemented with specific emphasis on enabling easy
 unit/integration testing that doesn't require a browser.
 
-
 %prep
 
 %build
@@ -38,7 +40,8 @@ gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
 pushd %{buildroot}%{geminstdir}
-cat %{PATCH0} | patch -s -p2
+patch -s -p2 < %{PATCH0}
+patch -s -p2 < %{PATCH1}
 popd
 
 # Remove backup files
@@ -77,6 +80,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 1:2.3.2-3
+- Fix activerecord test for reset_session (#2200 upstream)
+
 * Wed Oct  7 2009 David Lutterkort <lutter@redhat.com> - 1:2.3.2-2
 - Bump epoch; rails is not updatable across versions (bz 520843)