[rubygem-activemodel] Fixed the Builder dependencies in .gemspec file.

[Vít Ondruch]

commit abbf7a980a92d015ea08dd5201b819f5b05eaf07
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Sat Oct 13 15:49:46 2012 +0200

    Fixed the Builder dependencies in .gemspec file.

 activemodel-3.2.8-relax-builder-dependency.patch |   20 ++++++++++++++++++++
 rubygem-activemodel.spec                         |   16 +++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/activemodel-3.2.8-relax-builder-dependency.patch b/activemodel-3.2.8-relax-builder-dependency.patch
new file mode 100644
index 0000000..40a6d73
--- /dev/null
+++ b/activemodel-3.2.8-relax-builder-dependency.patch
@@ -0,0 +1,20 @@
+--- a/specifications/activemodel-3.2.8.gemspec
++++ b/specifications/activemodel-3.2.8.gemspec
+@@ -20,13 +20,13 @@
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<activesupport>, ["= 3.2.8"])
+-      s.add_runtime_dependency(%q<builder>, ["~> 3.0.0"])
++      s.add_runtime_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
+     else
+       s.add_dependency(%q<activesupport>, ["= 3.2.8"])
+-      s.add_dependency(%q<builder>, ["~> 3.0.0"])
++      s.add_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
+     end
+   else
+     s.add_dependency(%q<activesupport>, ["= 3.2.8"])
+-    s.add_dependency(%q<builder>, ["~> 3.0.0"])
++    s.add_dependency(%q<builder>, [">= 3.0.0", "< 3.2.0"])
+   end
+ end
+
diff --git a/rubygem-activemodel.spec b/rubygem-activemodel.spec
index 3bcc1ff..6868de9 100644
--- a/rubygem-activemodel.spec
+++ b/rubygem-activemodel.spec
@@ -5,7 +5,7 @@
 Summary: A toolkit for building modeling frameworks
 Name: rubygem-%{gem_name}
 Version: 3.2.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -13,18 +13,21 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone https://github.com/rails/rails.git && cd rails/activemodel && git checkout v3.2.7
 # tar czvf activemodel-3.2.7-tests.tgz test/
 Source1: %{gem_name}-%{version}-tests.tgz
-# ActiveModel depends on Bundler ~> 3.0.0. This fixes the test for Bundler >= 3.1.
+# ActiveModel depends on Bundler ~> 3.0.0. This relax the dependency and
+# fixes the test for Bundler >= 3.1.
 Patch0: activemodel-3.2.8-Update-Active-Model-xml-serialization-test-to-reflec.patch
+Patch1: activemodel-3.2.8-relax-builder-dependency.patch
 # Let's keep Requires and BuildRequires sorted alphabeticaly
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(builder) => 3.0.0
-Requires: rubygem(builder) < 3.1
+Requires: rubygem(builder) < 3.2
 BuildRequires: rubygems-devel
 BuildRequires: rubygem(activesupport) = %{version}
 BuildRequires: rubygem(bcrypt-ruby)
 BuildRequires: rubygem(builder) => 3.0.0
+BuildRequires: rubygem(builder) < 3.2
 BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(mocha)
 BuildArch: noarch
@@ -51,6 +54,10 @@ mkdir -p .%{gem_dir}
 gem install --local --install-dir .%{gem_dir} \
             --force %{SOURCE0}
 
+pushd .%{gem_dir}
+%patch1 -p1
+popd
+
 %build
 
 %install
@@ -84,6 +91,9 @@ popd
 
 
 %changelog
+* Sat Oct 13 2012 Vít Ondruch <vondruch at redhat.com> - 3.2.8-3
+- Fixed the Builder dependencies in .gemspec file.
+
 * Sat Oct 13 2012 Vít Ondruch <vondruch at redhat.com> - 3.2.8-2
 - Relaxed Builder dependnecy.