[rubygem-actionpack/f14/master] updated to actionpack 2.3.8

[Mohammed Morsi]

commit edb6567914719fcce6325dcd208dd14148014465
Author: Mohammed Morsi <mmorsi at redhat.com>
Date:   Wed Sep 1 05:50:44 2010 -0400

    updated to actionpack 2.3.8

 .gitignore                                         |    1 +
 rubygem-actionpack-2.3.5-rack-compat.patch         |  174 --------------------
 ...h => rubygem-actionpack-2.3.8-enable-test.patch |    8 +-
 rubygem-actionpack.spec                            |   31 +++-
 sources                                            |    2 +-
 5 files changed, 27 insertions(+), 189 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 226683a..f8f830e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 actionpack-2.3.5.gem
+/actionpack-2.3.8.gem
diff --git a/rubygem-actionpack-2.3.4-enable-test.patch b/rubygem-actionpack-2.3.8-enable-test.patch
similarity index 55%
rename from rubygem-actionpack-2.3.4-enable-test.patch
rename to rubygem-actionpack-2.3.8-enable-test.patch
index 0164c4c..752841d 100644
--- a/rubygem-actionpack-2.3.4-enable-test.patch
+++ b/rubygem-actionpack-2.3.8-enable-test.patch
@@ -1,9 +1,9 @@
---- test/active_record_unit.rb.debug	2009-09-18 01:45:17.000000000 +0900
-+++ test/active_record_unit.rb	2009-09-18 02:08:19.000000000 +0900
-@@ -17,7 +17,7 @@
+--- actionpack-2.3.8/test/active_record_unit.rb.orig	2010-07-01 14:22:29.000000000 -0400
++++ actionpack-2.3.8/test/active_record_unit.rb	2010-07-01 14:22:41.000000000 -0400
+@@ -17,7 +17,7 @@ else
    $stderr.print 'Attempting to load Active Record... '
    begin
-     PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
+     PATH_TO_AR = File.expand_path('../../../activerecord/lib', __FILE__)
 -    raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
 +    #raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
      $LOAD_PATH.unshift PATH_TO_AR
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index 851cc49..e8ba364 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -9,25 +9,25 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Epoch: 1
-Version: 2.3.5
+Version: 2.3.8
 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.4-enable-test.patch
+Patch0:  rubygem-actionpack-2.3.8-enable-test.patch
 #
 # Please someone fix the following Patch2!! (mtasaka)
 #
-Patch2:  rubygem-actionpack-2.3.5-rack-compat.patch
+#Patch2:  rubygem-actionpack-2.3.8-rack-compat.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
-Requires: rubygem(rack) >= 1.0.0
+Requires: rubygem(rack) >= 1.1.0
 Requires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems
 BuildRequires(check): rubygem(rake)
-BuildRequires(check): rubygem(rack) >= 1.0.0
+BuildRequires(check): rubygem(rack) >= 1.1.0
 BuildRequires(check): rubygem(mocha) >= 0.9.7
 BuildRequires(check): rubygem(activerecord) = %{version}
 BuildRequires(check): rubygem(sqlite3-ruby)
@@ -49,11 +49,10 @@ gem install --local --install-dir .%{gemdir} \
 
 # forcely modify gemspec for rack dependency
 sed -i -e '/rack/s|~>|>=|' \
-	./%{gemdir}/specifications/*gemspec
+ ./%{gemdir}/specifications/*gemspec
 
 pushd .%{geminstdir}
-%patch0 -p0
-%patch2 -p0
+%patch0 -p1
 
 # create missing symlink
 pushd test/fixtures/layout_tests/layouts/
@@ -70,6 +69,12 @@ popd
 # No! these are also needed for rake test
 # find ./%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
 
+# Fix wrong-file-end-of-line-encoding errors
+# No! these are also needed for rake test
+#for file in test/fixtures/multipart/* ; do
+#  sed -i 's/\r//' $file
+#done
+
 # Fix anything executable that does not have a shebang
 for file in `find ./%{geminstdir} -type f -perm /a+x`; do
     [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
@@ -111,11 +116,11 @@ rake test --trace
 %defattr(-, root, root, -)
 %dir %{geminstdir}
 %doc %{geminstdir}/CHANGELOG
-%doc %{geminstdir}/install.rb
 %{geminstdir}/lib
 %doc %{geminstdir}/MIT-LICENSE
-%{geminstdir}/Rakefile
 %doc %{geminstdir}/README
+%doc %{geminstdir}/install.rb
+%{geminstdir}/Rakefile
 %doc %{geminstdir}/RUNNING_UNIT_TESTS
 %doc %{geminstdir}/test/
 %doc %{gemdir}/doc/%{gemname}-%{version}
@@ -124,6 +129,12 @@ rake test --trace
 
 
 %changelog
+* Thu Aug 12 2010 Mohammed Morsi <mmorsi at redhat.com> - 1:2.3.8-2
+- Bumped actionpack rack dependency to version 1.1.0
+
+* Mon Aug 09 2010 Mohammed Morsi <mmorsi at redhat.com> - 1:2.3.8-1
+- Update to 2.3.8
+
 * Mon May 17 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:2.3.5-2
 - Set TMPDIR environment at %%check to make it sure all files created
   during rpmbuild are cleaned up
diff --git a/sources b/sources
index 9a8689c..a58f24f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c32297f6e4af8ac9971dbc116e98a636  actionpack-2.3.5.gem
+75d7e35afa5a5bfaac5c8fe5f8967ed7  actionpack-2.3.8.gem