diff --git a/0025-do-not-abuse-relative-paths-in-docker-plugin.patch b/0025-do-not-abuse-relative-paths-in-docker-plugin.patch new file mode 100644 index 0000000..be0fe7e --- /dev/null +++ b/0025-do-not-abuse-relative-paths-in-docker-plugin.patch @@ -0,0 +1,12 @@ +Index: vagrant-1.9.7/plugins/providers/docker/config.rb +=================================================================== +--- vagrant-1.9.7.orig/plugins/providers/docker/config.rb ++++ vagrant-1.9.7/plugins/providers/docker/config.rb +@@ -1,6 +1,6 @@ + require "pathname" + +-require_relative "../../../lib/vagrant/util/platform" ++require "vagrant/util/platform" + + module VagrantPlugins + module DockerProvider diff --git a/vagrant.changes b/vagrant.changes index 7d7691f..9c8b913 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 26 19:42:46 UTC 2017 - tmkn@tmkn.uk + +- Add 0025-do-not-abuse-relative-paths-in-docker-plugin.patch to + make docker plugin work. + ------------------------------------------------------------------- Sun Oct 22 19:00:05 UTC 2017 - robert.munteanu@gmail.com diff --git a/vagrant.spec b/vagrant.spec index 14b7c14..7796ecf 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -52,12 +52,13 @@ Patch21: 0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch Patch22: 0022-Do-not-use-deprecated-API.patch Patch23: 0023-vbox-fix-package.patch Patch24: 0024-do-not-depend-on-wdm.patch +Patch25: 0025-do-not-abuse-relative-paths-in-docker-plugin.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # force only one ruby version %define rb_build_versions %rb_default_ruby %define rb_build_abi %rb_default_ruby_abi -# +# BuildRequires: %{ruby >= 2.0.0} BuildRequires: %{rubygem bundler} BuildRequires: %{rubygem childprocess <= 0.7 } @@ -75,11 +76,11 @@ BuildRequires: %{rubygem net-sftp} BuildRequires: %{rubygem net-ssh:4.1} # Prevent have choice for rubygem(ruby:2.2.0:nokogiri) BuildRequires: %{rubygem nokogiri >= 1.7} -# Prevent have choice for rubygem(ruby:2.1.0:mime-types) >= 1.16 +# Prevent have choice for rubygem(ruby:2.1.0:mime-types) >= 1.16 BuildRequires: %{rubygem mime-types >= 2} -# Prevent have choice for rubygem(ruby:2.4.0:addressable) >= 2.3.6 +# Prevent have choice for rubygem(ruby:2.4.0:addressable) >= 2.3.6 BuildRequires: %{rubygem addressable >= 2.4 } -# Prevent have choice for rubygem(ruby:2.4.0:builder) >= 2.1.2 +# Prevent have choice for rubygem(ruby:2.4.0:builder) >= 2.1.2 BuildRequires: %{rubygem builder >= 3.1 } BuildRequires: ruby-macros >= 5 # inotify should go here @@ -172,6 +173,7 @@ Optional dependency offering bash completion for vagrant %patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 cp %{SOURCE3} .