From 9b1539e849f9cac85b98c793e26f6d56eb36faac Mon Sep 17 00:00:00 2001
From: Miklos Fazekas <mfazekas@szemafor.com>
Date: Sat, 26 Mar 2016 11:47:43 +0100
Subject: [PATCH 1/2] Add `require_relative` to gemspec template

---
 lib/bundler/templates/newgem/newgem.gemspec.tt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/bundler/templates/newgem/newgem.gemspec.tt b/lib/bundler/templates/newgem/newgem.gemspec.tt
index 5505540b9ef..18060942c35 100644
--- a/lib/bundler/templates/newgem/newgem.gemspec.tt
+++ b/lib/bundler/templates/newgem/newgem.gemspec.tt
@@ -1,6 +1,4 @@
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "<%= config[:namespaced_path] %>/version"
+require_relative 'lib/<%=config[:namespaced_path]%>/version'
 
 Gem::Specification.new do |spec|
   spec.name          = <%= config[:name].inspect %>

From 2478e3426180c4f78bafa21a0ca3f5cc4ffb7f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Tue, 23 Apr 2019 18:33:38 +0200
Subject: [PATCH 2/2] Use `require_relative` in bundler's gemspec

---
 bundler.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundler.gemspec b/bundler.gemspec
index 2711604265c..7ebecb6f6f6 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 begin
-  require File.expand_path("../lib/bundler/version", __FILE__)
+  require_relative "lib/bundler/version"
 rescue LoadError
   # for Ruby core repository
-  require File.expand_path("../version", __FILE__)
+  require_relative "version"
 end
 
 Gem::Specification.new do |s|