From 548a38c88eda5c6c69e307775d4921238280f9da Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Oct 24 2018 11:06:44 +0000 Subject: Allow use of newer Childprocess gem also needs macro from rubygems-devel to edit vagrant.gemspec. --- diff --git a/vagrant.spec b/vagrant.spec index e9ade0a..88ec51d 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -57,6 +57,7 @@ Requires(pre): shadow-utils BuildRequires: bsdtar BuildRequires: ruby +BuildRequires: rubygems-devel BuildRequires: rubygem(listen) BuildRequires: rubygem(childprocess) BuildRequires: rubygem(hashicorp-checkpoint) @@ -108,6 +109,9 @@ Documentation for %{name}. %patch1 -p1 %build +%gemspec_remove_dep -s %{name}.gemspec -g childprocess '~> 0.5.0' +%gemspec_add_dep -s %{name}.gemspec -g childprocess '>= 0.5.0' + gem build %{name}.gemspec gem install -V --local \ @@ -186,8 +190,7 @@ sed -i '/git/ s/^/#/' ../vagrant-spec/vagrant-spec.gemspec sed -i '/thor/ s/~>/>=/' ../vagrant-spec/vagrant-spec.gemspec sed -i '/rspec/ s/~>/>=/' ./vagrant.gemspec sed -i '/rspec/ s/~>/>=/' ../vagrant-spec/vagrant-spec.gemspec -# TODO: package newer childproccess -sed -i '/childprocess/ s/~>/<=/' ../vagrant-spec/vagrant-spec.gemspec +sed -i '/childprocess/ s/~>/>=/' ../vagrant-spec/vagrant-spec.gemspec #Insert new test dependencies sed -i '25 i\ spec.add_dependency "webmock"' ../vagrant-spec/vagrant-spec.gemspec