[rubygem-haml-rails] Rebuild with new Haml.

[Bohuslav Kabrda]

commit b4b854fdcafbab641287cd19a61f2169a14b6299
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Fri Jul 27 15:11:41 2012 +0200

    Rebuild with new Haml.
    
    - Fix tests failing with Rails 3.2.

 haml-rails-0.3.4-fix-tests.patch |   21 +++++++++++++++++++++
 rubygem-haml-rails.spec          |   13 +++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/haml-rails-0.3.4-fix-tests.patch b/haml-rails-0.3.4-fix-tests.patch
new file mode 100644
index 0000000..8c2b27e
--- /dev/null
+++ b/haml-rails-0.3.4-fix-tests.patch
@@ -0,0 +1,21 @@
+commit 2da01aed78940c70c486b7078a743adbcac2f92b
+Author: Bohuslav Kabrda <bkabrda at redhat.com>
+Date:   Fri Jul 27 16:05:26 2012 +0300
+
+    Fix tests for Rails 3.2
+    
+    Rails::Generators.configure! doesn't have a default parameter in Rails 3.2. This pull request adds it to make tests run with Rails 3.2.
+
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index fd0dac9..ddc2bf9 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -18,7 +18,7 @@ Rails.application.config.root = Rails.root
+ 
+ # Call configure to load the settings from
+ # Rails.application.config.generators to Rails::Generators
+-Rails::Generators.configure!
++Rails::Generators.configure! Rails.application.config.generators
+ 
+ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+ 
diff --git a/rubygem-haml-rails.spec b/rubygem-haml-rails.spec
index cc6c6d2..84ec061 100644
--- a/rubygem-haml-rails.spec
+++ b/rubygem-haml-rails.spec
@@ -6,11 +6,12 @@
 Summary: Haml-rails provides Haml generators for Rails 3
 Name: rubygem-%{gem_name}
 Version: 0.3.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Development/Languages
 License: MIT or Ruby
 URL: http://github.com/indirect/haml-rails
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Patch0: %{gem_name}-%{version}-fix-tests.patch
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems) >= 1.3.6
 Requires: ruby 
@@ -49,6 +50,10 @@ mkdir -p .%{gem_dir}
 gem install --local --install-dir .%{gem_dir} \
             --force %{SOURCE0}
 
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
+
 %build
 
 %install
@@ -67,7 +72,7 @@ popd
 %dir %{gem_instdir}
 %exclude %{gem_instdir}/.gitignore
 %{gem_libdir}
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
@@ -80,6 +85,10 @@ popd
 
 
 %changelog
+* Fri Jul 27 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.3.4-8
+- Rebuild with new Haml.
+- Fix tests failing with Rails 3.2.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild