From ecfe63bec52229ba711a150e257aa570e93a389b Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Thu, 3 Jan 2013 15:31:51 +0100 Subject: Update to ActiveSupport 3.2.10. --- .gitignore | 2 ++ ...0.0-Make-the-tests-pass-with-minitest-4.2.patch | 27 ++++++++++++++++++++++ activesupport-add-bigdecimal-dependency.patch | 6 ++--- rubygem-activesupport.spec | 12 ++++++++-- sources | 4 ++-- 5 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 activesupport-4.0.0-Make-the-tests-pass-with-minitest-4.2.patch diff --git a/.gitignore b/.gitignore index 545d14d..7c22541 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ activesupport-2.3.8.gem /activesupport-3.2.7.gem /activesupport-3.2.8-tests.tgz /activesupport-3.2.8.gem +/activesupport-3.2.10-tests.tgz +/activesupport-3.2.10.gem diff --git a/activesupport-4.0.0-Make-the-tests-pass-with-minitest-4.2.patch b/activesupport-4.0.0-Make-the-tests-pass-with-minitest-4.2.patch new file mode 100644 index 0000000..ee08fa1 --- /dev/null +++ b/activesupport-4.0.0-Make-the-tests-pass-with-minitest-4.2.patch @@ -0,0 +1,27 @@ +From ae6d2efd844cc6cf6822fe424d8e09c510153c90 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= + +Date: Mon, 5 Nov 2012 15:12:09 -0200 +Subject: [PATCH] Make the tests pass with minitest 4.2 + +--- + activesupport/test/test_case_test.rb | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb +index c02bfa8..64426d0 100644 +--- a/activesupport/test/test_case_test.rb ++++ b/activesupport/test/test_case_test.rb +@@ -16,6 +16,9 @@ module ActiveSupport + def options + nil + end ++ ++ def record(*args) ++ end + end + + if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions +-- +1.8.0.1 + diff --git a/activesupport-add-bigdecimal-dependency.patch b/activesupport-add-bigdecimal-dependency.patch index dd7a77e..e366c3c 100644 --- a/activesupport-add-bigdecimal-dependency.patch +++ b/activesupport-add-bigdecimal-dependency.patch @@ -1,7 +1,7 @@ ---- a/specifications/activesupport-3.2.8.gemspec.orig 2012-07-18 14:52:50.000000000 +0200 -+++ b/specifications/activesupport-3.2.8.gemspec 2012-07-18 14:56:49.367668024 +0200 +--- a/specifications/activesupport-3.2.10.gemspec.orig 2012-07-18 14:52:50.000000000 +0200 ++++ b/specifications/activesupport-3.2.10.gemspec 2012-07-18 14:56:49.367668024 +0200 @@ -20,13 +20,16 @@ - s.specification_version = 3 + s.specification_version = 4 if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q, [">= 0"]) diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 196bd85..d076d12 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -6,7 +6,7 @@ Summary: Support and utility classes used by the Rails framework Name: rubygem-%{gem_name} Epoch: 1 -Version: 3.2.8 +Version: 3.2.10 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -30,6 +30,10 @@ Patch1: activesupport-tests-fix.patch # is in Fedora http://bugzilla.redhat.com/show_bug.cgi?id=668822 Patch2: activesupport-remove-memcache-build-dep.patch +# Rails 3.2 does not work with Minitest 4.2 yet. +# https://github.com/rails/rails/commit/ae6d2efd844cc6cf6822fe424d8e09c510153c90 +Patch3: activesupport-4.0.0-Make-the-tests-pass-with-minitest-4.2.patch + # We need to add the bigdecimal dependency to gemspec, otherwise it won't be # loaded. The reason for this is unbundling it from ruby libdir and moving # it under %%{gem_dir} (therefore if not in Gemfile, it won't be found). @@ -75,6 +79,7 @@ tar xzvf %{SOURCE2} -C .%{gem_instdir} pushd .%{gem_instdir} %patch1 -p0 %patch2 -p0 +%patch3 -p2 popd pushd .%{gem_dir} @@ -106,6 +111,9 @@ popd %changelog +* Thu Jan 03 2013 Vít Ondruch - 1:3.2.10-1 +- Update to ActiveSupport 3.2.10. + * Mon Aug 13 2012 Vít Ondruch - 1:3.2.8-1 - Update to ActiveSupport 3.2.8. @@ -210,7 +218,7 @@ popd * Wed Nov 28 2007 David Lutterkort - 1.4.4-3 - Fix buildroot -* Tue Nov 14 2007 David Lutterkort - 1.4.4-2 +* Tue Nov 13 2007 David Lutterkort - 1.4.4-2 - Install README and CHANGELOG in _docdir * Tue Oct 30 2007 David Lutterkort - 1.4.4-1 diff --git a/sources b/sources index 52deae7..0f5c58a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3843e42e1b1e345a1767afac640c961c activesupport-3.2.8-tests.tgz -65c4dc238e26ee7b92b705135452615e activesupport-3.2.8.gem +2043d7fa906c38e1ddbfab0df3d2a8cb activesupport-3.2.10-tests.tgz +740abd41291f2ca850ee3f578f1f65cc activesupport-3.2.10.gem -- cgit