From f1603e0ba24af7d4dd65d7c763e3daf069c5216a Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Wed, 9 Jan 2013 16:20:02 +0100 Subject: Downgrade to ActionPack 2.3.16. --- .gitignore | 2 + ...actionpack-3.2.8-relax-builder-dependency.patch | 30 ------- ...of-after-invoked-controller-action.-becau.patch | 30 ------- rubygem-actionpack-enable-test.patch | 22 ++--- ...gem-actionpack-relax-sprockets-dependency.patch | 29 ------- rubygem-actionpack.spec | 96 ++++++++++------------ sources | 4 +- 7 files changed, 55 insertions(+), 158 deletions(-) delete mode 100644 rubygem-actionpack-3.2.8-relax-builder-dependency.patch delete mode 100644 rubygem-actionpack-4.0.0-change-spy-of-after-invoked-controller-action.-becau.patch delete mode 100644 rubygem-actionpack-relax-sprockets-dependency.patch diff --git a/.gitignore b/.gitignore index 1ce5da3..75e5554 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ actionpack-2.3.8.gem /actionpack-3.2.10.gem /actionpack-3.2.11-tests.tgz /actionpack-3.2.11.gem +/actionpack-2.3.16.gem +/actionpack-2.3.16-tests.tgz diff --git a/rubygem-actionpack-3.2.8-relax-builder-dependency.patch b/rubygem-actionpack-3.2.8-relax-builder-dependency.patch deleted file mode 100644 index e99986b..0000000 --- a/rubygem-actionpack-3.2.8-relax-builder-dependency.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/specifications/actionpack-3.2.11.gemspec -+++ b/specifications/actionpack-3.2.11.gemspec -@@ -23,7 +23,7 @@ - s.add_runtime_dependency(%q, ["= 3.2.11"]) - s.add_runtime_dependency(%q, ["= 3.2.11"]) - s.add_runtime_dependency(%q, ["~> 1.2"]) -- s.add_runtime_dependency(%q, ["~> 3.0.0"]) -+ s.add_runtime_dependency(%q, [">= 3.0.0", "< 3.2.0"]) - s.add_runtime_dependency(%q, ["~> 1.4.0"]) - s.add_runtime_dependency(%q, ["~> 0.6.1"]) - s.add_runtime_dependency(%q, ["~> 1.0.4"]) -@@ -34,7 +34,7 @@ - s.add_dependency(%q, ["= 3.2.11"]) - s.add_dependency(%q, ["= 3.2.11"]) - s.add_dependency(%q, ["~> 1.2"]) -- s.add_dependency(%q, ["~> 3.0.0"]) -+ s.add_dependency(%q, [">= 3.0.0", "< 3.2.0"]) - s.add_dependency(%q, ["~> 1.4.0"]) - s.add_dependency(%q, ["~> 0.6.1"]) - s.add_dependency(%q, ["~> 1.0.4"]) -@@ -46,7 +46,7 @@ - s.add_dependency(%q, ["= 3.2.11"]) - s.add_dependency(%q, ["= 3.2.11"]) - s.add_dependency(%q, ["~> 1.2"]) -- s.add_dependency(%q, ["~> 3.0.0"]) -+ s.add_dependency(%q, [">= 3.0.0", "< 3.2.0"]) - s.add_dependency(%q, ["~> 1.4.0"]) - s.add_dependency(%q, ["~> 0.6.1"]) - s.add_dependency(%q, ["~> 1.0.4"]) - 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 deleted file mode 100644 index 8cf1660..0000000 --- a/rubygem-actionpack-4.0.0-change-spy-of-after-invoked-controller-action.-becau.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4f0f1b5d5249e05fa173b296af2ec6f6e4f78d33 Mon Sep 17 00:00:00 2001 -From: SHIBATA Hiroshi -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-enable-test.patch b/rubygem-actionpack-enable-test.patch index d620f83..752841d 100644 --- a/rubygem-actionpack-enable-test.patch +++ b/rubygem-actionpack-enable-test.patch @@ -1,19 +1,11 @@ ---- test/active_record_unit.rb.orig 2011-01-10 23:31:54.197506001 -0500 -+++ 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) +--- 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) -- $LOAD_PATH.unshift PATH_TO_AR -+ #PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib" + #raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR) -+ #$LOAD_PATH.unshift PATH_TO_AR + $LOAD_PATH.unshift PATH_TO_AR require 'active_record' - rescue LoadError => e -- $stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}" -+ #$stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}" - ActiveRecordTestConnector.able_to_connect = false - end - end + require 'active_record/fixtures' diff --git a/rubygem-actionpack-relax-sprockets-dependency.patch b/rubygem-actionpack-relax-sprockets-dependency.patch deleted file mode 100644 index 32e3c53..0000000 --- a/rubygem-actionpack-relax-sprockets-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- specifications/actionpack-3.2.11.gemspec.old 2012-07-20 12:06:27.000000000 +0200 -+++ specifications/actionpack-3.2.11.gemspec 2012-07-20 12:44:09.491547387 +0200 -@@ -27,7 +27,7 @@ - s.add_runtime_dependency(%q, ["~> 1.4.0"]) - s.add_runtime_dependency(%q, ["~> 0.6.1"]) - s.add_runtime_dependency(%q, ["~> 1.0.4"]) -- s.add_runtime_dependency(%q, ["~> 2.2.1"]) -+ s.add_runtime_dependency(%q, [">= 2.2.1"]) - s.add_runtime_dependency(%q, ["~> 2.7.0"]) - s.add_development_dependency(%q, ["~> 0.3.29"]) - else -@@ -38,7 +38,7 @@ - s.add_dependency(%q, ["~> 1.4.0"]) - s.add_dependency(%q, ["~> 0.6.1"]) - s.add_dependency(%q, ["~> 1.0.4"]) -- s.add_dependency(%q, ["~> 2.2.1"]) -+ s.add_dependency(%q, [">= 2.2.1"]) - s.add_dependency(%q, ["~> 2.7.0"]) - s.add_dependency(%q, ["~> 0.3.29"]) - end -@@ -50,7 +50,7 @@ - s.add_dependency(%q, ["~> 1.4.0"]) - s.add_dependency(%q, ["~> 0.6.1"]) - s.add_dependency(%q, ["~> 1.0.4"]) -- s.add_dependency(%q, ["~> 2.2.1"]) -+ s.add_dependency(%q, [">= 2.2.1"]) - s.add_dependency(%q, ["~> 2.7.0"]) - s.add_dependency(%q, ["~> 0.3.29"]) - end diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec index c87fbd8..7bce998 100644 --- a/rubygem-actionpack.spec +++ b/rubygem-actionpack.spec @@ -1,12 +1,16 @@ # Generated from actionpack-1.13.5.gem by gem2rpm -*- rpm-spec -*- %global gem_name actionpack +%if 0%{?el6} +%global rubyabi 1.8 +%else %global rubyabi 1.9.1 +%endif Summary: Web-flow and rendering framework putting the VC in MVC Name: rubygem-%{gem_name} Epoch: 1 -Version: 3.2.11 +Version: 2.3.16 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -17,60 +21,41 @@ 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.11 -# tar czvf actionpack-3.2.11-tests.tgz test/ +# git checkout v2.3.16 +# tar czvf actionpack-2.3.16-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) -Requires: rubygem(activemodel) = %{version} Requires: rubygem(activesupport) = %{version} -Requires: rubygem(builder) >= 3.0.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-cache) >= 1.2 -Requires: rubygem(rack-cache) < 2 -Requires: rubygem(rack-test) >= 0.6.1 -Requires: rubygem(rack-test) < 0.7 -Requires: rubygem(sprockets) >= 2.1.3 +Requires: rubygem(rack) >= 1.1.0 Requires: ruby(abi) = %{rubyabi} +%if 0%{?fedora} BuildRequires: rubygems-devel -BuildRequires: rubygem(activemodel) = %{version} -BuildRequires: rubygem(activerecord) = %{version} -BuildRequires: rubygem(activesupport) = %{version} -BuildRequires: rubygem(erubis) >= 2.7.0 -BuildRequires: rubygem(erubis) < 2.8 -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-cache) >= 1.2 -BuildRequires: rubygem(rack-cache) < 2 -BuildRequires: rubygem(rack-test) >= 0.6.1 -BuildRequires: rubygem(rack-test) < 0.7 -BuildRequires: rubygem(sprockets) >= 2.1.3 -BuildRequires: rubygem(sqlite3) -BuildRequires: rubygem(therubyracer) -BuildRequires: rubygem(tzinfo) >= 0.3.29 -BuildRequires: rubygem(tzinfo) < 0.4 -BuildRequires: rubygem(uglifier) +%else +BuildRequires: ruby(rubygems) +%endif +BuildRequires(check): rubygem(rake) +BuildRequires(check): rubygem(rack) >= 1.1.0 +BuildRequires(check): rubygem(mocha) >= 0.9.7 +BuildRequires(check): rubygem(activerecord) = %{version} +BuildRequires(check): rubygem(sqlite3-ruby) BuildArch: noarch Provides: rubygem(%{gem_name}) = %{version} +# macros for RHEL6 compatibility: +%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)} +%{!?gem_instdir: %global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}} +%{!?gem_libdir: %global gem_libdir %{gem_instdir}/lib} +%{!?gem_cache: %global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}.gem} +%{!?gem_spec: %global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec} +%{!?gem_docdir: %global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}} +%{!?gem_extdir: %global gem_extdir %{_libdir}/gems/exts/%{gem_name}-%{version}} +%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')} + + %description Eases web-request routing, handling, and response as a half-way front, half-way page controller. Implemented with specific emphasis on enabling easy @@ -91,17 +76,15 @@ gem install --local --install-dir .%{gem_dir} \ -V \ --force --no-rdoc %{SOURCE0} +# forcely modify gemspec for rack dependency +sed -i -e '/rack/s|~>|>=|' \ + ./%{gem_dir}/specifications/*gemspec + # move the tests into place tar xzvf %{SOURCE2} -C .%{gem_instdir} pushd .%{gem_instdir} -%patch0 -p0 -%patch3 -p2 -popd - -pushd .%{gem_dir} -%patch1 -p0 -%patch2 -p1 +%patch0 -p1 popd # Remove backup files @@ -143,10 +126,13 @@ sed -i '1,2d' test/abstract_unit.rb mv test/controller/assert_select_test.rb \ test/controller/assert_select_test.rb.skip +# The test suite fails with many errors on EL 6. +%if 0%{?fedora} 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 ruby -w -I.:lib:test -e 'Dir.glob("test/activerecord/**/*_test.rb").each {|t| require t}' +%endif popd %files @@ -158,11 +144,17 @@ popd %files doc %doc %{gem_docdir} -%doc %{gem_instdir}/CHANGELOG.md -%doc %{gem_instdir}/README.rdoc +%doc %{gem_instdir}/CHANGELOG +%doc %{gem_instdir}/README +%doc %{gem_instdir}/install.rb +%{gem_instdir}/Rakefile +%doc %{gem_instdir}/RUNNING_UNIT_TESTS %{gem_instdir}/test/ %changelog +* Wed Feb 06 2013 Ken Dreyer - 1:2.3.16-1 +- Downgrade to ActionPack 2.3.16. + * Wed Jan 09 2013 Vít Ondruch - 1:3.2.11-1 - Update to the ActionPack 3.2.11. diff --git a/sources b/sources index a7e3ba8..6844f76 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8c801b54bf35b626c94ebe0ddd703a74 actionpack-3.2.11-tests.tgz -a6cb82fea9bcaf5a356b966189ed9fa5 actionpack-3.2.11.gem +5cee7f8665b44fb6affe47e6d479011c actionpack-2.3.16.gem +6e58a422d2d5a7d5dc1a91bbc5dd4597 actionpack-2.3.16-tests.tgz -- cgit