[packages/passenger] - disble duplicate bundler run (rails does it on package creation) - rel 2

[baggins]

commit 2066724212b19ce05c181339f2201cb55326d752
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Sep 5 08:25:22 2014 +0200

    - disble duplicate bundler run (rails does it on package creation)
    - rel 2

 no-bundler.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 passenger.spec   |  5 ++++-
 2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/passenger.spec b/passenger.spec
index b3f208d..69ad045 100644
--- a/passenger.spec
+++ b/passenger.spec
@@ -4,7 +4,7 @@
 Summary:	A module to bridge Ruby on Rails to Apache
 Name:		passenger
 Version:	4.0.50
-Release:	1
+Release:	2
 # Passenger code uses MIT license.
 # Bundled(Boost) uses Boost Software License
 # BCrypt and Blowfish files use BSD license.
@@ -17,6 +17,7 @@ Source0:	https://github.com/phusion/passenger/archive/release-%{version}.tar.gz
 Source1:	apache-mod_%{name}.conf
 Patch0:		alias+public.patch
 Patch1:		dirs.patch
+Patch2:		no-bundler.patch
 URL:		https://www.phusionpassenger.com/
 BuildRequires:	apache-devel >= 2.0.55-1
 BuildRequires:	apache-tools
@@ -56,6 +57,7 @@ License:	Boost and BSD and BSD with advertising and MIT and zlib
 Group:		Daemons
 Requires:	%{name} = %{version}-%{release}
 Requires:	apache(modules-api) = %apache_modules_api
+Requires:	ruby-bundler
 Provides:	apache(mod_passenger)
 Provides:	apache(mod_rails)
 Obsoletes:	apache-mod_rails < 4.0
@@ -81,6 +83,7 @@ Dokumentacji w formacie ri dla Phusion Passenger
 %setup -q -n %{name}-release-%{version}
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 __rubydir=$(echo %{ruby_vendorlibdir} | %{__sed} -e 's|/usr||')
 
diff --git a/no-bundler.patch b/no-bundler.patch
new file mode 100644
index 0000000..93f50a0
--- /dev/null
+++ b/no-bundler.patch
@@ -0,0 +1,41 @@
+--- passenger-release-4.0.50/lib/phusion_passenger/loader_shared_helpers.rb~	2014-08-26 16:15:57.000000000 +0200
++++ passenger-release-4.0.50/lib/phusion_passenger/loader_shared_helpers.rb	2014-09-05 08:19:31.449268337 +0200
+@@ -230,38 +230,6 @@
+ 		# The app developer may also override our strategy with this magic file.
+ 		elsif File.exist?('config/setup_load_paths.rb')
+ 			require File.expand_path('config/setup_load_paths')
+-
+-		# Older versions of Bundler use .bundle/environment.rb as the Bundler
+-		# environment lock file. This has been replaced by Gemfile.lock in later
+-		# versions, but we still support the older mechanism.
+-		# If the Bundler environment lock file exists then load that. If it
+-		# exists then there's a 99.9% chance that loading it is the correct
+-		# thing to do.
+-		elsif File.exist?('.bundle/environment.rb')
+-			running_bundler(options) do
+-				require File.expand_path('.bundle/environment')
+-			end
+-
+-		# If the legacy Bundler environment file doesn't exist then there are two
+-		# possibilities:
+-		# 1. Bundler is not used, in which case we don't have to do anything.
+-		# 2. Bundler *is* used, but either the user is using a newer Bundler versions,
+-		#    or the gems are not locked. In either case, we're supposed to call
+-		#    Bundler.setup.
+-		#
+-		# The existence of Gemfile indicates whether (2) is true:
+-		elsif File.exist?('Gemfile')
+-			# In case of Rails 3, config/boot.rb already calls Bundler.setup.
+-			# However older versions of Rails may not so loading boot.rb might
+-			# not be the correct thing to do. To be on the safe side we
+-			# call Bundler.setup ourselves; calling Bundler.setup twice is
+-			# harmless. If this isn't the correct thing to do after all then
+-			# there's always the load_path_setup_file option and
+-			# setup_load_paths.rb.
+-			running_bundler(options) do
+-				require 'rubygems'
+-				require 'bundler/setup'
+-			end
+ 		end
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/passenger.git/commitdiff/2066724212b19ce05c181339f2201cb55326d752