[rubygem-activemodel] Relaxed Builder dependnecy.

[Vít Ondruch]

commit 06ad94aebc15224aa186b228997fbb5f05d772ce
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Sat Oct 13 14:43:58 2012 +0200

    Relaxed Builder dependnecy.

 ...ve-Model-xml-serialization-test-to-reflec.patch |   37 ++++++++++++++++++++
 rubygem-activemodel.spec                           |   10 ++++-
 2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/activemodel-3.2.8-Update-Active-Model-xml-serialization-test-to-reflec.patch b/activemodel-3.2.8-Update-Active-Model-xml-serialization-test-to-reflec.patch
new file mode 100644
index 0000000..65a546a
--- /dev/null
+++ b/activemodel-3.2.8-Update-Active-Model-xml-serialization-test-to-reflec.patch
@@ -0,0 +1,37 @@
+From 0180e090ab6cbe66f7b521a0c03e278a0463accd Mon Sep 17 00:00:00 2001
+From: Carlos Antonio da Silva <carlosantoniodasilva at gmail.com>
+Date: Fri, 7 Sep 2012 13:08:30 -0300
+Subject: [PATCH] Update Active Model xml serialization test to reflect a
+ change in builder
+
+Due to a change in builder, nil values and empty strings now generates
+closed tags, so instead of this:
+
+    <pseudonyms nil=\"true\"></pseudonyms>
+
+It generates this:
+
+    <pseudonyms nil=\"true\"/>
+
+Document this change in Rails so that people can track it down easily if
+necessary.
+---
+ activemodel/test/cases/serializers/xml_serialization_test.rb |  2 +-
+ 1 files changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/activemodel/test/cases/serializers/xml_serialization_test.rb b/activemodel/test/cases/serializers/xml_serialization_test.rb
+index 8c5a3c5..e2bb0dd 100755
+--- a/activemodel/test/cases/serializers/xml_serialization_test.rb
++++ b/activemodel/test/cases/serializers/xml_serialization_test.rb
+@@ -133,7 +133,7 @@ class XmlSerializationTest < ActiveModel::TestCase
+   end
+ 
+   test "should serialize nil" do
+-    assert_match %r{<pseudonyms nil=\"true\"></pseudonyms>}, @contact.to_xml(:methods => :pseudonyms)
++    assert_match %r{<pseudonyms nil=\"true\"/>}, @contact.to_xml(:methods => :pseudonyms)
+   end
+ 
+   test "should serialize integer" do
+-- 
+1.7.11.4
+
diff --git a/rubygem-activemodel.spec b/rubygem-activemodel.spec
index af969c6..3bcc1ff 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: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -13,6 +13,8 @@ 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.
+Patch0: activemodel-3.2.8-Update-Active-Model-xml-serialization-test-to-reflec.patch
 # Let's keep Requires and BuildRequires sorted alphabeticaly
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
@@ -23,7 +25,6 @@ BuildRequires: rubygems-devel
 BuildRequires: rubygem(activesupport) = %{version}
 BuildRequires: rubygem(bcrypt-ruby)
 BuildRequires: rubygem(builder) => 3.0.0
-BuildRequires: rubygem(builder) < 3.1
 BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(mocha)
 BuildArch: noarch
@@ -61,6 +62,8 @@ cp -a .%{gem_dir}/* \
 pushd .%{gem_instdir}
 tar xzvf %{SOURCE1}
 
+cat %{PATCH0} | patch -p2
+
 # load_path is not available, remove its require.
 sed -i '1,2d' test/cases/helper.rb
 
@@ -81,6 +84,9 @@ popd
 
 
 %changelog
+* Sat Oct 13 2012 Vít Ondruch <vondruch at redhat.com> - 3.2.8-2
+- Relaxed Builder dependnecy.
+
 * Mon Aug 13 2012 Vít Ondruch <vondruch at redhat.com> - 3.2.8-1
 - Update to ActiveModel 3.2.8.