Update to ActiveSupport 3.2.6.

- Removed unneeded BuildRoot tag.
- Tests no longer fail with newer versions of Mocha, remove workaround.

4 files changed, 40 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index bec48ad..004dfda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ activesupport-2.3.8.gem
 /activesupport-3.0.13.gem
 /activesupport-3.0.15-tests.tgz
 /activesupport-3.0.15.gem
+/activesupport-3.2.6-tests.tgz
+/activesupport-3.2.6.gem
diff --git a/activesupport-add-bigdecimal-dependency.patch b/activesupport-add-bigdecimal-dependency.patch
index d778349..941753f 100644
--- a/activesupport-add-bigdecimal-dependency.patch
+++ b/activesupport-add-bigdecimal-dependency.patch
@@ -1,16 +1,19 @@
-diff --git a/specifications/activesupport-3.0.15.gemspec.orig b/specifications/activesupport-3.0.15.gemspec
-index 0277593..ef9b71d 100644
---- a/specifications/activesupport-3.0.15.gemspec.orig
-+++ b/specifications/activesupport-3.0.15.gemspec
-@@ -20,8 +20,11 @@ Gem::Specification.new do |s|
+--- a/specifications/activesupport-3.2.6.gemspec.orig	2012-07-18 14:52:50.000000000 +0200
++++ b/specifications/activesupport-3.2.6.gemspec	2012-07-18 14:56:49.367668024 +0200
+@@ -20,13 +20,16 @@
      s.specification_version = 3
  
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-+      s.add_runtime_dependency("bigdecimal", ">= 0")
++      s.add_runtime_dependency(%q<bigdecimal>, [">= 0"])
+       s.add_runtime_dependency(%q<i18n>, ["~> 0.6"])
+       s.add_runtime_dependency(%q<multi_json>, ["~> 1.0"])
      else
-+      s.add_dependency("bigdecimal", ">= 0")
++      s.add_dependency(%q<bigdecimal>, [">= 0"])
+       s.add_dependency(%q<i18n>, ["~> 0.6"])
+       s.add_dependency(%q<multi_json>, ["~> 1.0"])
      end
    else
-+    s.add_dependency("bigdecimal", ">= 0")
++    s.add_dependency(%q<bigdecimal>, [">= 0"])
+     s.add_dependency(%q<i18n>, ["~> 0.6"])
+     s.add_dependency(%q<multi_json>, ["~> 1.0"])
    end
- end
diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec
index ea16356..e564a65 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.0.15
+Version: 3.2.6
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -18,8 +18,8 @@ Source0: http://rubygems.org/downloads/activesupport-%{version}.gem
 # Rails rpms, you may check it out like so
 # git clone http://github.com/rails/rails.git
 # cd rails/activesupport/
-# git checkout v3.0.15
-# tar czvf activesupport-3.0.15-tests.tgz test/
+# git checkout v3.2.6
+# tar czvf activesupport-3.2.6-tests.tgz test/
 Source2: activesupport-%{version}-tests.tgz
 
 # Removes code which breaks the test suite due to a
@@ -35,20 +35,26 @@ Patch2: activesupport-remove-memcache-build-dep.patch
 # it under %%{gem_dir} (therefore if not in Gemfile, it won't be found).
 Patch4: activesupport-add-bigdecimal-dependency.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ruby(rubygems)
 Requires: ruby(abi) = %{rubyabi}
-Requires: rubygem(i18n)
+# Let's keep Requires and BuildRequires sorted alphabeticaly
 Requires: rubygem(bigdecimal)
+Requires: rubygem(i18n) >= 0.6
+Requires: rubygem(i18n) < 1.0
+Requires: rubygem(multi_json) >= 1.0
+Requires: rubygem(multi_json) < 2
 BuildRequires: rubygems-devel
-BuildRequires: rubygem(mocha)
-BuildRequires: rubygem(i18n)
-#BuildRequires: rubygem(memcache-client)
-BuildRequires: rubygem(tzinfo)
+BuildRequires: rubygem(bigdecimal)
 BuildRequires: rubygem(builder)
-BuildRequires: rubygem(rack)
+BuildRequires: rubygem(i18n) >= 0.6
+BuildRequires: rubygem(i18n) < 1.0
+#BuildRequires: rubygem(memcache-client)
 BuildRequires: rubygem(minitest)
-BuildRequires: rubygem(bigdecimal)
+BuildRequires: rubygem(mocha)
+BuildRequires: rubygem(multi_json) >= 1.0
+BuildRequires: rubygem(multi_json) < 2
+BuildRequires: rubygem(rack)
+BuildRequires: rubygem(tzinfo)
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
 
@@ -84,17 +90,14 @@ cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}
 
 %check
 pushd %{buildroot}%{gem_instdir} 
-# Test fails with newer mocha. Keep with older one is not solution.
-# https://github.com/rails/rails/pull/6046
-sed -i '35,41 s|^|#|' test/whiny_nil_test.rb
-
 ruby -Itest -e "Dir.glob('./test/**/*_test.rb').each {|t| require t}"
 popd
 
 %files
 %dir %{gem_instdir}
-%doc %{gem_instdir}/CHANGELOG
+%doc %{gem_instdir}/CHANGELOG.md
 %{gem_libdir}
+%doc %{gem_instdir}/MIT-LICENSE
 %doc %{gem_instdir}/README.rdoc
 %doc %{gem_docdir}
 %{gem_cache}
@@ -103,6 +106,11 @@ popd
 
 
 %changelog
+* Wed Jul 18 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.2.6-1
+- Update to ActiveSupport 3.2.6.
+- Removed unneeded BuildRoot tag.
+- Tests no longer fail with newer versions of Mocha, remove workaround.
+
 * Fri Jun 15 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.0.15-1
 - Update to ActiveSupport 3.0.15.
 
diff --git a/sources b/sources
index bb7c4c9..acc37e8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-41a6183b39b1a04013ca690f759d704e  activesupport-3.0.15-tests.tgz
-71a4c80bc0a267e558dd6d217a993d3a  activesupport-3.0.15.gem
+694db3f80a0cc30c5978157a7f24a86a  activesupport-3.2.6-tests.tgz
+7deefdc2a340355612a729ac967b32f4  activesupport-3.2.6.gem