diff --git a/vagrant.changes b/vagrant.changes index 9f6010e..b05bcad 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 28 13:31:45 UTC 2019 - Dan Čermák + +- Update Requires and Buildrequires to match vagrant.gemspec + ------------------------------------------------------------------- Fri Jan 11 15:29:14 UTC 2019 - Dan Čermák diff --git a/vagrant.spec b/vagrant.spec index 00f0588..43a08f0 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -55,85 +55,105 @@ 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} +# s.required_ruby_version = "~> 2.2", "< 2.6" +BuildRequires: %{ruby >= 2.2.0} +# temporary override, so that we can build with ruby 2.6 +# FIXME: this will be the default with vagrant >= 2.2.3, remove the comment then +BuildRequires: %{ruby < 2.7} # # # BuildRequires: %{rubygem bundler} +# s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" +BuildRequires: %{rubygem bcrypt_pbkdf:1.0.0 } # s.add_dependency "childprocess", "~> 0.6.0" BuildRequires: %{rubygem childprocess:0.6 } -BuildRequires: %{rubygem crack } +# s.add_dependency "ed25519", "~> 1.2.4" +BuildRequires: %{rubygem ed25519:1.2.4 } # s.add_dependency "erubis", "~> 2.7.0" BuildRequires: %{rubygem erubis:2.7 } -# s.add_development_dependency "fake_ftp", "~> 0.1" -BuildRequires: %{rubygem fake_ftp:0.1 } -# s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" -BuildRequires: %{rubygem hashicorp-checkpoint:0.1.5 } -# s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0" -BuildRequires: %{rubygem i18n < 0.8 } -BuildRequires: %{rubygem i18n >= 0.6 } +# s.add_dependency "i18n", "~> 1.1.1" +BuildRequires: %{rubygem i18n:1.1.1 } # s.add_dependency "listen", "~> 3.1.5" BuildRequires: %{rubygem listen:3.1.5 } +# s.add_dependency "hashicorp-checkpoint", "~> 0.1.5" +BuildRequires: %{rubygem hashicorp-checkpoint:0.1.5 } # s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11" BuildRequires: %{rubygem log4r < 1.1.11 } BuildRequires: %{rubygem log4r >= 1.1.9 } -# s.add_dependency "net-scp", "~> 1.2.0" -BuildRequires: %{rubygem net-scp:1.2 } +# s.add_dependency "net-ssh", "~> 5.0.0" +BuildRequires: %{rubygem net-ssh:5.0} # s.add_dependency "net-sftp", "~> 2.1" BuildRequires: %{rubygem net-sftp:2.1 } -# s.add_dependency "net-ssh", "~> 4.2.0" -# patched to 5.0.x by 0027-now-use-rubygem-net-ssh-5.0.x.patch -BuildRequires: %{rubygem net-ssh:5.0} -# Prevent have choice for rubygem(ruby:2.2.0:nokogiri) -BuildRequires: %{rubygem nokogiri >= 1.7} +# s.add_dependency "net-scp", "~> 1.2.0" +BuildRequires: %{rubygem net-scp:1.2 } +# s.add_dependency "rb-kqueue", "~> 0.2.0" +BuildRequires: %{rubygem rb-kqueue:0.2 } +# s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" +BuildRequires: %{rubygem rest-client < 3.0} +BuildRequires: %{rubygem rest-client >= 1.6} +# s.add_dependency "rubyzip", "~> 1.2.2" +BuildRequires: %{rubygem rubyzip:1.2.2} +# Intentionally removed, wdm only works on Windows +# BuildRequires: %{rubygem wdm } +# s.add_dependency "winrm", "~> 2.1" +BuildRequires: %{rubygem winrm:2.1 } +# s.add_dependency "winrm-fs", "~> 1.0" +BuildRequires: %{rubygem winrm-fs:1 } +# s.add_dependency "winrm-elevated", "~> 1.1" +BuildRequires: %{rubygem winrm-elevated:1.1 } +# s.add_dependency "vagrant_cloud", "~> 2.0.0" +BuildRequires: %{rubygem vagrant_cloud >= 2.0.0 } +BuildRequires: %{rubygem vagrant_cloud < 2.1.0 } + +# devel dependencies: +# s.add_development_dependency "rake", "~> 12.0.0" +BuildRequires: %{rubygem rake:12.0 } +# s.add_development_dependency "rspec", "~> 3.5.0" +BuildRequires: %{rubygem rspec:3.5 } +# s.add_development_dependency "rspec-its", "~> 1.2.0" +BuildRequires: %{rubygem rspec-its:1.2 } +# s.add_dependency "ruby_dep", "<= 1.3.1" +BuildRequires: %{rubygem ruby_dep <= 1.3.1 } +# s.add_development_dependency "webmock", "~> 2.3.1" +BuildRequires: %{rubygem webmock:2.3 } +# s.add_development_dependency "fake_ftp", "~> 0.1.1" +BuildRequires: %{rubygem fake_ftp:0.1.1 } + # 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 BuildRequires: %{rubygem addressable >= 2.4 } # Prevent have choice for rubygem(ruby:2.4.0:builder) >= 2.1.2 BuildRequires: %{rubygem builder >= 3.1 } + BuildRequires: ruby-macros >= 5 -# s.add_development_dependency "rake", "~> 12.0.0" -BuildRequires: %{rubygem rake:12.0 } -# s.add_dependency "rb-kqueue", "~> 0.2.0" -BuildRequires: %{rubygem rb-kqueue:0.2 } -# s.add_dependency "rest-client", ">= 1.6.0", "< 3.0" -BuildRequires: %{rubygem rest-client < 3.0} -BuildRequires: %{rubygem rest-client >= 1.6} -# s.add_development_dependency "rspec", "~> 3.5.0" -BuildRequires: %{rubygem rspec:3.5 } -# s.add_development_dependency "rspec-its", "~> 1.2.0" -BuildRequires: %{rubygem rspec-its:1.2 } -BuildRequires: %{rubygem rspec:3.5 } -BuildRequires: %{rubygem ruby_dep <= 1.5 } -# Intentionally removed, wdm only works on Windows -# BuildRequires: %{rubygem wdm } -# s.add_development_dependency "webmock", "~> 2.3.1" -BuildRequires: %{rubygem webmock:2.3 } -# s.add_dependency "winrm", "~> 2.1" -BuildRequires: %{rubygem winrm:2.1 } -# s.add_dependency "winrm-elevated", "~> 1.1" -BuildRequires: %{rubygem winrm-elevated:1.1 } -# s.add_dependency "winrm-fs", "~> 1.0" -BuildRequires: %{rubygem winrm-fs:1 } + # # -# -Requires: %{rubygem childprocess} +# s.add_dependency "bcrypt_pbkdf", "~> 1.0.0" +Requires: %{rubygem bcrypt_pbkdf:1.0.0 } +# s.add_dependency "childprocess", "~> 0.6.0" +Requires: %{rubygem childprocess:0.6} +# s.add_dependency "ed25519", "~> 1.2.4" +Requires: %{rubygem ed25519} # Prevent have choice for rubygem(ruby:2.2.0:erubis) -Requires: %{rubygem erubis >= 2.7} +# s.add_dependency "erubis", "~> 2.7.0" +Requires: %{rubygem erubis:2.7} Requires: %{rubygem i18n} Requires: %{rubygem listen} +Requires: %{rubygem hashicorp-checkpoint} Requires: %{rubygem log4r} +Requires: %{rubygem net-ssh} +Requires: %{rubygem net-sftp} # Prevent have choice for rubygem(ruby:2.2.0:net-scp) Requires: %{rubygem net-scp >= 1.2} -Requires: %{rubygem net-sftp} -Requires: %{rubygem net-ssh} -# Prevent have choice for rubygem(ruby:2.2.0:nokogiri) -Requires: %{rubygem nokogiri >= 1.7} -#Requires: %{rubygem rb-kqueue0} +Requires: %{rubygem rb-kqueue} Requires: %{rubygem rest-client} +Requires: %{rubygem winrm} +Requires: %{rubygem winrm-fs} +Requires: %{rubygem winrm-elevated} +Requires: %{rubygem vagrant_cloud} # We don't require rubygem mime-types since it's pulled in transitively # Requires: bsdtar