handle vendored deps

diff --git a/ruby-bundler.spec b/ruby-bundler.spec
index c08b1738646ee492b1a9cc561cce2ac506fd560f..5e1d1cb077658435fc8dfc101e0706ac330c2b39 100644 (file)
--- a/ruby-bundler.spec
+++ b/ruby-bundler.spec
@@ -13,6 +13,7 @@ License:      MIT
 Group:         Development/Languages
 Source0:       http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5: 3d3df420e34f4595c441730a42bf9c2e
+Patch0:                unvendor.patch
 URL:           http://bundler.io/
 BuildRequires: rpm-rubyprov
 BuildRequires: rpmbuild(macros) >= 1.656
@@ -23,7 +24,7 @@ BuildRequires:        ruby-ronn >= 0.7.3
 BuildRequires: ruby-rspec < 2.100
 BuildRequires: ruby-rspec >= 2.99.0.beta1
 %endif
-# R thor and net-http-persistent because we unvendored them: lib/bundler/vendored_persistent.rb
+Requires:      ruby-molinillo
 Requires:      ruby-net-http-persistent
 Requires:      ruby-rubygems >= 1.3.6
 Requires:      ruby-thor >= 0.17

diff --git a/unvendor.patch b/unvendor.patch
new file mode 100644 (file)
index 0000000..90f9750
--- /dev/null
+++ b/unvendor.patch
@@ -0,0 +1,25 @@
+--- bundler-1.13.5/lib/bundler/vendored_persistent.rb~ 2016-11-06 20:57:27.000000000 +0200
++++ bundler-1.13.5/lib/bundler/vendored_persistent.rb  2016-11-06 23:11:47.166877510 +0200
+@@ -7,6 +7,4 @@
+   # some Ruby builds don't have OpenSSL
+ end
+ 
+-vendor = File.expand_path("../vendor", __FILE__)
+-$:.unshift(vendor) unless $:.include?(vendor)
+ require "net/http/persistent"
+--- bundler-1.13.5/lib/bundler/vendored_thor.rb~       2016-11-06 20:57:27.000000000 +0200
++++ bundler-1.13.5/lib/bundler/vendored_thor.rb        2016-11-06 23:12:33.642653832 +0200
+@@ -1,4 +1,4 @@
+ # frozen_string_literal: true
+ module Bundler; end
+-require "bundler/vendor/thor/lib/thor"
+-require "bundler/vendor/thor/lib/thor/actions"
++require "thor"
++require "thor/actions"
+--- bundler-1.13.5/lib/bundler/vendored_molinillo.rb~  2016-11-06 20:57:27.000000000 +0200
++++ bundler-1.13.5/lib/bundler/vendored_molinillo.rb   2016-11-06 23:13:07.227752557 +0200
+@@ -1,3 +1,3 @@
+ # frozen_string_literal: true
+ module Bundler; end
+-require "bundler/vendor/molinillo/lib/molinillo"
++require "molinillo"