jbuilder dependency removed in upstream.

diff --git a/rOCCI-server.spec b/rOCCI-server.spec
index 4937831..e19ad7d 100644 (file)
--- a/rOCCI-server.spec
+++ b/rOCCI-server.spec
@@ -42,7 +42,6 @@ Requires:       mod_ssl
 Requires:       rubygem(dalli)
 Requires:       rubygem(hashie)
 Requires:       rubygem(ice_nine)
-Requires:       rubygem(jbuilder)
 Requires:       rubygem(kgio)
 Requires:       rubygem(logstasher)
 Requires:       rubygem(rails) >= 4.0.0
@@ -134,14 +133,11 @@ cp -p Gemfile Gemfile.upstream
 cp -p lib/authentication_strategies/bundles/Gemfile.keystone Gemfile.keystone.upstream
 cp -p lib/backends/bundles/Gemfile.opennebula Gemfile.opennebula.upstream
 cp -p lib/backends/bundles/Gemfile.ec2 Gemfile.ec2.upstream
-# jbuilder still needed
-sed -i "s/#\(\s*gem ['\"]jbuilder['\"]\)/\1/" Gemfile
 # relax upstream requirements
 while read name ver file; do
   file=${file:-'Gemfile'}
   sed -i "s/^\(\s*gem ['\"]$name['\"]\).*/\1, '>= $ver'/" $file
 done << EOF
-jbuilder     1.5.0
 rails        4.0.0
 rails-api    0.1.0
 rspec-rails  2.14.0

diff --git a/rocci-server-unbundle.diff b/rocci-server-unbundle.diff
index cc96e0a..0c5fb70 100644 (file)
--- a/rocci-server-unbundle.diff
+++ b/rocci-server-unbundle.diff
@@ -1,13 +1,13 @@
 Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Thu Sep 18 16:10:01 2014 +0200
+Date:   Sat Oct 4 20:46:48 2014 +0200
 
     Remove the bundler.
 
 diff --git a/config/application.rb b/config/application.rb
-index 98480fb..e768d67 100644
+index 98480fb..0363d32 100644
 --- a/config/application.rb
 +++ b/config/application.rb
-@@ -8,9 +8,30 @@ require 'action_controller/railtie'
+@@ -8,9 +8,29 @@ require 'action_controller/railtie'
  require 'rails/test_unit/railtie'
  # require 'sprockets/railtie'
  
@@ -17,7 +17,6 @@ index 98480fb..e768d67 100644
 +# Gemfile requires
 +require 'rails'
 +require 'rails-api'
-+require 'jbuilder'
 +require 'rack/cors'
 +require 'dalli'
 +require 'kgio'