[DRE-commits] [redmine] 02/03: Unplug bundler in the plugins as well

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master-experimental
in repository redmine.

commit 750cc4655c164aad7575e4b3ffaf73e8579ead10
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Oct 24 14:36:58 2013 +0200

    Unplug bundler in the plugins as well
---
 debian/patches/2019_unplug_bundler.patch |   35 +++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/debian/patches/2019_unplug_bundler.patch b/debian/patches/2019_unplug_bundler.patch
index 519e40b..43bcae7 100644
--- a/debian/patches/2019_unplug_bundler.patch
+++ b/debian/patches/2019_unplug_bundler.patch
@@ -3,9 +3,9 @@ Description: redmine package shouldn't need bundler to run
 Forwarded: not-needed, i'm not ruby expert enough to convince upstream about changing that
 Author: Jérémy Lal <kapouer at melix.org>
 Last-Update: 2013-09-28
---- a/config/boot.rb
-+++ b/config/boot.rb
-@@ -3,4 +3,6 @@
+--- redmine.orig/config/boot.rb
++++ redmine/config/boot.rb
+@@ -3,4 +3,6 @@ require 'rubygems'
  # Set up gems listed in the Gemfile.
  ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
  
@@ -13,8 +13,8 @@ Last-Update: 2013-09-28
 +# disable bundler setup
 +# require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
 +
---- a/config/preinitializer.rb
-+++ b/config/preinitializer.rb
+--- redmine.orig/config/preinitializer.rb
++++ redmine/config/preinitializer.rb
 @@ -1,20 +1,20 @@
 -begin
 -  require "rubygems"
@@ -54,3 +54,28 @@ Last-Update: 2013-09-28
 +#  $stderr.puts "Some gems may need to be installed or updated.\nPlease run `bundle install --without development test`."
 +#  exit 1
 +#end
+--- redmine.orig/lib/plugins/awesome_nested_set/Rakefile
++++ redmine/lib/plugins/awesome_nested_set/Rakefile
+@@ -1,7 +1,7 @@
+ # -*- encoding: utf-8 -*-
+ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+-require 'rubygems'
+-require 'bundler/setup'
++#require 'rubygems'
++#require 'bundler/setup'
+ require 'awesome_nested_set/version'
+ 
+ require "rspec/core/rake_task"
+--- redmine.orig/lib/plugins/awesome_nested_set/spec/spec_helper.rb
++++ redmine/lib/plugins/awesome_nested_set/spec/spec_helper.rb
+@@ -1,8 +1,8 @@
+ $:.unshift(File.dirname(__FILE__) + '/../lib')
+ plugin_test_dir = File.dirname(__FILE__)
+ 
+-require 'rubygems'
+-require 'bundler/setup'
++#require 'rubygems'
++#require 'bundler/setup'
+ 
+ require 'rspec'
+ require 'logger'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git