defolos/vagrant
SHA256
1
0
Fork 0
forked from pool/vagrant
Code Pull Requests Activity

Accepting request 620645 from Virtualization:vagrant

Browse Source 
update to 2.1.1; adjusted to allow builds with rubygem-net-ssh 5.0.x

OBS-URL: https://build.opensuse.org/request/show/620645
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2018-07-06 08:42:03 +00:00 committed by Git OBS Bridge
parent 4d0dd68159
commit 6df2cc9f35
13 changed files with 462 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
0001-Disable-Checkpoint.patch
View File

@ -1,120 +0,0 @@
From f12371988e650c372b44acb3347fc4348476e082 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@debian.org>
Date: Sat, 11 Oct 2014 16:48:07 -0300
Subject: [PATCH] Disable Checkpoint
We don't want vagrant phoning home all the time
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
lib/vagrant/environment.rb | 38 ++-----------------------------------
plugins/commands/version/command.rb | 29 ----------------------------
2 files changed, 2 insertions(+), 65 deletions(-)
diff --git a/lib/vagrant/environment.rb b/lib/vagrant/environment.rb
index 125070f3d..5d41ff028 100644
--- a/lib/vagrant/environment.rb
+++ b/lib/vagrant/environment.rb
@@ -4,7 +4,6 @@ require 'pathname'
require 'set'
require 'thread'
-require "checkpoint"
require 'log4r'
require 'vagrant/util/file_mode'
@@ -128,34 +127,6 @@ module Vagrant
# Prepare the directories
setup_home_path
- # Run checkpoint in a background thread on every environment
- # initialization. The cache file will cause this to mostly be a no-op
- # most of the time.
- @checkpoint_thr = Thread.new do
- Thread.current[:result] = nil
-
- # If we disabled checkpoint via env var, don't run this
- if ENV["VAGRANT_CHECKPOINT_DISABLE"].to_s != ""
- @logger.info("checkpoint: disabled from env var")
- next
- end
-
- # If we disabled state and knowing what alerts we've seen, then
- # disable the signature file.
- signature_file = @data_dir.join("checkpoint_signature")
- if ENV["VAGRANT_CHECKPOINT_NO_STATE"].to_s != ""
- @logger.info("checkpoint: will not store state")
- signature_file = nil
- end
-
- Thread.current[:result] = Checkpoint.check(
- product: "vagrant",
- version: VERSION,
- signature_file: signature_file,
- cache_file: @data_dir.join("checkpoint_cache"),
- )
- end
-
# Setup the local data directory. If a configuration path is given,
# it is expanded relative to the root path. Otherwise, we use the
# default (which is also expanded relative to the root path).
@@ -289,14 +260,9 @@ module Vagrant
end
end
- # Checkpoint returns the checkpoint result data. If checkpoint is
- # disabled, this will return nil. See the hashicorp-checkpoint gem
- # for more documentation on the return value.
- #
- # @return [Hash]
+ # Usage of the checkpoint service is disabled in the Debian package.
def checkpoint
- @checkpoint_thr.join(THREAD_MAX_JOIN_TIMEOUT)
- return @checkpoint_thr[:result]
+ nil
end
# Makes a call to the CLI with the given arguments as if they
diff --git a/plugins/commands/version/command.rb b/plugins/commands/version/command.rb
index c3c47acfa..654b2516a 100644
--- a/plugins/commands/version/command.rb
+++ b/plugins/commands/version/command.rb
@@ -21,35 +21,6 @@ module VagrantPlugins
"vagrant.version_current", version: Vagrant::VERSION))
@env.ui.machine("version-installed", Vagrant::VERSION)
- # Load the latest information
- cp = @env.checkpoint
- if !cp
- @env.ui.output("\n"+I18n.t(
- "vagrant.version_no_checkpoint"))
- return 0
- end
-
- latest = cp["current_version"]
-
- # Output latest version
- @env.ui.output(I18n.t(
- "vagrant.version_latest", version: latest))
- @env.ui.machine("version-latest", latest)
-
- # Determine if its a new version, and if so, output some more
- # information.
- current = Gem::Version.new(Vagrant::VERSION)
- latest = Gem::Version.new(latest)
- if current >= latest
- @env.ui.success(" \n" + I18n.t(
- "vagrant.version_latest_installed"))
- return 0
- end
-
- # Out of date! Let the user know how to upgrade.
- @env.ui.output(" \n" + I18n.t(
- "vagrant.version_upgrade_howto", version: latest.to_s))
-
0
end
end
--
2.13.0

28
0006-Relax-dependency-resolution.patch
View File

@ -1,28 +0,0 @@
From f1ca337645e6a3b55fba063b1f2972d190c82d6b Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@debian.org>
Date: Sun, 16 Aug 2015 10:45:47 +0200
Subject: [PATCH] Relax dependency resolution
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
Gemfile | 6 ------
vagrant.gemspec | 25 +++++++++++++++----------
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/Gemfile b/Gemfile
index 15f245819..b4e2a20bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,3 @@
source "https://rubygems.org"
gemspec
-
-if File.exist?(File.expand_path("../../vagrant-spec", __FILE__))
- gem 'vagrant-spec', path: "../vagrant-spec"
-else
- gem 'vagrant-spec', git: "https://github.com/mitchellh/vagrant-spec.git"
-end
--
2.13.0

58
0010-virtualbox-5.2-support.patch
View File

@ -1,58 +0,0 @@
From 7d73af5637de41f1e53b8f1ef2ea9baf76842dfb Mon Sep 17 00:00:00 2001
From: Jehiah Czebotar <jehiah@gmail.com>
Date: Fri, 8 Sep 2017 15:00:17 -0400
Subject: [PATCH] Virtualbox 5.2 support
---
plugins/providers/virtualbox/driver/meta.rb | 1 +
plugins/providers/virtualbox/driver/version_5_2.rb | 16 ++++++++++++++++
plugins/providers/virtualbox/plugin.rb | 1 +
3 files changed, 18 insertions(+)
create mode 100644 plugins/providers/virtualbox/driver/version_5_2.rb
diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
index 0dd186d8c7..ec457a866a 100644
--- a/plugins/providers/virtualbox/driver/meta.rb
+++ b/plugins/providers/virtualbox/driver/meta.rb
@@ -62,6 +62,7 @@ def initialize(uuid=nil)
"4.3" => Version_4_3,
"5.0" => Version_5_0,
"5.1" => Version_5_1,
+ "5.2" => Version_5_2,
}
if @@version.start_with?("4.2.14")
diff --git a/plugins/providers/virtualbox/driver/version_5_2.rb b/plugins/providers/virtualbox/driver/version_5_2.rb
new file mode 100644
index 0000000000..cd6c0b6c5c
--- /dev/null
+++ b/plugins/providers/virtualbox/driver/version_5_2.rb
@@ -0,0 +1,16 @@
+require File.expand_path("../version_5_1", __FILE__)
+
+module VagrantPlugins
+ module ProviderVirtualBox
+ module Driver
+ # Driver for VirtualBox 5.2.x
+ class Version_5_2 < Version_5_1
+ def initialize(uuid)
+ super
+
+ @logger = Log4r::Logger.new("vagrant::provider::virtualbox_5_2")
+ end
+ end
+ end
+ end
+end
diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb
index 399747a6a2..090bc50616 100644
--- a/plugins/providers/virtualbox/plugin.rb
+++ b/plugins/providers/virtualbox/plugin.rb
@@ -57,6 +57,7 @@ module Driver
autoload :Version_4_3, File.expand_path("../driver/version_4_3", __FILE__)
autoload :Version_5_0, File.expand_path("../driver/version_5_0", __FILE__)
autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
+ autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__)
end
module Model

26
0020-also-build-with-ruby2.4.patch
View File

@ -1,26 +0,0 @@
From 9e12cba5e8be3df9dfe5768913dec6a04341b35c Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Mon, 24 Jul 2017 21:47:17 +0200
Subject: [PATCH] also build with ruby2.4
Signed-off-by: Johannes Kastl <opensuse_buildservice@ojkastl.de>
---
vagrant.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index c92ca1701..8a839ca41 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.summary = "Build and distribute virtualized development environments."
s.description = "Vagrant is a tool for building and distributing virtualized development environments."
- s.required_ruby_version = "~> 2.2", "< 2.4"
+ s.required_ruby_version = "~> 2.2"
s.required_rubygems_version = ">= 1.3.6"
s.rubyforge_project = "vagrant"
--
2.13.3

145
0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch
View File

@ -1,145 +0,0 @@
From 3cdd1d09f9617e6005fc643000b5486ffbe22577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 14 Feb 2017 10:13:29 +0100
Subject: [PATCH] Use Integer instead of Fixnum for Ruby 2.4+ compatibility.
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
lib/vagrant/cli.rb | 2 +-
lib/vagrant/plugin/v2/communicator.rb | 2 +-
lib/vagrant/registry.rb | 2 +-
plugins/provisioners/shell/config.rb | 4 ++--
plugins/pushes/local-exec/config.rb | 4 ++--
test/unit/plugins/provisioners/shell/config_test.rb | 6 +++---
test/unit/plugins/pushes/local-exec/config_test.rb | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/vagrant/cli.rb b/lib/vagrant/cli.rb
index a6e9655f0..cca8c0184 100644
--- a/lib/vagrant/cli.rb
+++ b/lib/vagrant/cli.rb
@@ -45,7 +45,7 @@ module Vagrant
result = 1
end
- result = 0 if !result.is_a?(Fixnum)
+ result = 0 if !result.is_a?(Integer)
return result
end
diff --git a/lib/vagrant/plugin/v2/communicator.rb b/lib/vagrant/plugin/v2/communicator.rb
index 511fb6002..41385f486 100644
--- a/lib/vagrant/plugin/v2/communicator.rb
+++ b/lib/vagrant/plugin/v2/communicator.rb
@@ -50,7 +50,7 @@ module Vagrant
# until then. It will wait up to the given duration or raise an
# exception if something goes wrong.
#
- # @param [Fixnum] duration Timeout in seconds.
+ # @param [Integer] duration Timeout in seconds.
# @return [Boolean] Will return true on successful connection
# or false on timeout.
def wait_for_ready(duration)
diff --git a/lib/vagrant/registry.rb b/lib/vagrant/registry.rb
index d84a745a5..c0c4e1bad 100644
--- a/lib/vagrant/registry.rb
+++ b/lib/vagrant/registry.rb
@@ -52,7 +52,7 @@ module Vagrant
# Return the number of elements in this registry.
#
- # @return [Fixnum]
+ # @return [Integer]
def length
@items.keys.length
end
diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
index 049eb15d0..05da320e3 100644
--- a/plugins/provisioners/shell/config.rb
+++ b/plugins/provisioners/shell/config.rb
@@ -106,10 +106,10 @@ module VagrantPlugins
def args_valid?
return true if !args
return true if args.is_a?(String)
- return true if args.is_a?(Fixnum)
+ return true if args.is_a?(Integer)
if args.is_a?(Array)
args.each do |a|
- return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
+ return false if !a.kind_of?(String) && !a.kind_of?(Integer)
end
return true
diff --git a/plugins/pushes/local-exec/config.rb b/plugins/pushes/local-exec/config.rb
index d62dfa8fa..9ed466088 100644
--- a/plugins/pushes/local-exec/config.rb
+++ b/plugins/pushes/local-exec/config.rb
@@ -63,10 +63,10 @@ module VagrantPlugins
def args_valid?
return true if !args
return true if args.is_a?(String)
- return true if args.is_a?(Fixnum)
+ return true if args.is_a?(Integer)
if args.is_a?(Array)
args.each do |a|
- return false if !a.kind_of?(String) && !a.kind_of?(Fixnum)
+ return false if !a.kind_of?(String) && !a.kind_of?(Integer)
end
return true
diff --git a/test/unit/plugins/provisioners/shell/config_test.rb b/test/unit/plugins/provisioners/shell/config_test.rb
index c4d260b90..905a28b03 100644
--- a/test/unit/plugins/provisioners/shell/config_test.rb
+++ b/test/unit/plugins/provisioners/shell/config_test.rb
@@ -30,7 +30,7 @@ describe "VagrantPlugins::Shell::Config" do
expect(result["shell provisioner"]).to eq([])
end
- it "passes with fixnum args" do
+ it "passes with integer args" do
subject.path = file_that_exists
subject.args = 1
subject.finalize!
@@ -112,7 +112,7 @@ describe "VagrantPlugins::Shell::Config" do
end
describe 'finalize!' do
- it 'changes fixnum args into strings' do
+ it 'changes integer args into strings' do
subject.path = file_that_exists
subject.args = 1
subject.finalize!
@@ -120,7 +120,7 @@ describe "VagrantPlugins::Shell::Config" do
expect(subject.args).to eq '1'
end
- it 'changes fixnum args in arrays into strings' do
+ it 'changes integer args in arrays into strings' do
subject.path = file_that_exists
subject.args = ["string", 1, 2]
subject.finalize!
diff --git a/test/unit/plugins/pushes/local-exec/config_test.rb b/test/unit/plugins/pushes/local-exec/config_test.rb
index 1bde10d98..9442b6420 100644
--- a/test/unit/plugins/pushes/local-exec/config_test.rb
+++ b/test/unit/plugins/pushes/local-exec/config_test.rb
@@ -70,7 +70,7 @@ describe VagrantPlugins::LocalExecPush::Config do
expect(errors).to be_empty
end
- it "passes with fixnum args" do
+ it "passes with integer args" do
subject.args = 1
expect(errors).to be_empty
end
@@ -118,7 +118,7 @@ describe VagrantPlugins::LocalExecPush::Config do
expect(errors).to be_empty
end
- it "passes with fixnum args" do
+ it "passes with integer args" do
subject.args = 1
expect(errors).to be_empty
end
--
2.13.3

26
0022-Do-not-use-deprecated-API.patch
View File

@ -1,26 +0,0 @@
From 6d269293e37db86325bec0a17502d68838d28214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 14 Feb 2017 10:33:58 +0100
Subject: [PATCH] Do not use deprecated API.
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
lib/vagrant/util/keypair.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/vagrant/util/keypair.rb b/lib/vagrant/util/keypair.rb
index 342d3264f..5e3d10ea6 100644
--- a/lib/vagrant/util/keypair.rb
+++ b/lib/vagrant/util/keypair.rb
@@ -26,7 +26,7 @@ module Vagrant
private_key = rsa_key.to_pem
if password
- cipher = OpenSSL::Cipher::Cipher.new('des3')
+ cipher = OpenSSL::Cipher.new('des3')
private_key = rsa_key.to_pem(cipher, password)
end
--
2.13.3

26
0024-do-not-depend-on-wdm.patch
View File

@ -1,11 +1,25 @@
diff -ur vagrant-1.9.7.orig/vagrant.gemspec vagrant-1.9.7/vagrant.gemspec
--- vagrant-1.9.7.orig/vagrant.gemspec 2017-08-16 11:52:01.226243101 +0300
+++ vagrant-1.9.7/vagrant.gemspec 2017-08-29 15:32:55.920511390 +0300
@@ -27,7 +27,6 @@
From 92ee846e1d5da65c75af6efef3f5ebdfa367158a Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Mon, 4 Jun 2018 09:18:23 +0200
Subject: [PATCH] do not depend on wdm
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
vagrant.gemspec | 1 -
1 file changed, 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 4096fd684..6b8736f6a 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
s.add_dependency "net-scp", "~> 1.2.0"
s.add_dependency "rb-kqueue", "~> 0.2.0"
s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
- s.add_dependency "wdm", "~> 0.1.0"
s.add_dependency "win32-file", "~> 0.8.1"
s.add_dependency "win32-file-security", "~> 1.0.10"
s.add_dependency "winrm", "~> 2.1"
s.add_dependency "winrm-fs", "~> 1.0"
s.add_dependency "winrm-elevated", "~> 1.1"
--
2.17.1

26
0026-remove-dependency-on-win32-file.patch Normal file
View File

@ -0,0 +1,26 @@
From e00908d36792ba0736ba20c3e1ebbf974a564cb2 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Mon, 4 Jun 2018 11:04:54 +0200
Subject: [PATCH] remove dependency on win32-file*
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
vagrant.gemspec | 2 --
1 file changed, 2 deletions(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 6b8736f6a..5f60fd0d8 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -27,8 +27,6 @@ Gem::Specification.new do |s|
s.add_dependency "net-scp", "~> 1.2.0"
s.add_dependency "rb-kqueue", "~> 0.2.0"
s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
- s.add_dependency "win32-file", "~> 0.8.1"
- s.add_dependency "win32-file-security", "~> 1.0.10"
s.add_dependency "winrm", "~> 2.1"
s.add_dependency "winrm-fs", "~> 1.0"
s.add_dependency "winrm-elevated", "~> 1.1"
--
2.17.1

26
0027-now-use-rubygem-net-ssh-5.0.x.patch Normal file
View File

@ -0,0 +1,26 @@
From 54648b91f9531b6fd0a9639c0ec5d8331c79907c Mon Sep 17 00:00:00 2001
From: Johannes Kastl <kastl@b1-systems.de>
Date: Sun, 1 Jul 2018 15:21:34 +0200
Subject: [PATCH] now use rubygem net-ssh 5.0.x
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
---
vagrant.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index 4096fd684..f3a8d7d76 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
s.add_dependency "listen", "~> 3.1.5"
s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
- s.add_dependency "net-ssh", "~> 4.2.0"
+ s.add_dependency "net-ssh", "~> 5.0.0"
s.add_dependency "net-sftp", "~> 2.1"
s.add_dependency "net-scp", "~> 1.2.0"
s.add_dependency "rb-kqueue", "~> 0.2.0"
--
2.18.0

3
vagrant-1.9.7.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:194de72442a2d08f6e04fbed8698a99d190a0e7203d35b49e80d4ddfcb71fb1b
size 1119024

3
vagrant-2.1.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b54b39ad2bdfe038f5a6767a745f2139d6f62e6e4745008e906f2e1c658fa4d
size 1204711

301
vagrant.changes
View File

@ -1,3 +1,304 @@
-------------------------------------------------------------------
Sun Jul 1 16:55:53 UTC 2018 - opensuse_buildservice@ojkastl.de
- added patch 0027-now-use-rubygem-net-ssh-5.0.x.patch to allow builds with latest version of net-ssh in Tumbleweed
-------------------------------------------------------------------
Mon Jun 4 09:38:13 UTC 2018 - opensuse_buildservice@ojkastl.de
- replace shebang in /usr/lib64/ruby/gems/*/gems/vagrant-2.1.1/.runner.sh
- remove shebang in /etc/bash_completion.d/vagrant.sh
-------------------------------------------------------------------
Mon Jun 4 09:06:27 UTC 2018 - opensuse_buildservice@ojkastl.de
- added patch 0026-remove-dependency-on-win32-file.patch
-------------------------------------------------------------------
Mon Jun 4 07:36:34 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to 2.1.1
IMPROVEMENTS:
- guest/linux: Support builtin vboxsf module for shared folders [GH-9800]
- host/windows: Update SMB capability to work without Get-SmbShare cmdlet [GH-9785]
BUG FIXES:
- core/triggers: Initialize internal trigger object for machine before initializing provider [GH-9784]
- core/triggers: Ensure internal trigger fire does not get called if plugin installed [GH-9799]
- provider/hyperv: Call import script with switchid instead of switchname [GH-9781]
-------------------------------------------------------------------
Mon Jun 4 07:32:50 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to 2.1.0
FEATURES:
- core: Integrate vagrant-triggers plugin functionality into core Vagrant [GH-9713]
IMPROVEMENTS:
- core: Improve messaging around not finding requested provider [GH-9735]
- core: Disable exception reports by default [GH-9738]
- core: Continue on if vagrant fails to parse metadata box for update [GH-9760]
- hosts/linux: Support RDP capability within WSL [GH-9758]
- hosts/windows: Add SMB default mount options capability and set default version to 2.0 [GH-9734]
- provider/hyperv: Include neighbor check for MAC on guest IP detection [GH-9737]
- provider/virtualbox: Do not require VirtualBox availability within WSL [GH-9759]
- provisioner/chef_zero: Support arrays for data_bags_path [GH-9669]
- util/downloader: Don't raise error if response is HTTP 416 [GH-9729]
- util/platform: Update Hyper-V enabled check [GH-9746]
BUG FIXES:
- communicators/ssh: Log error and proceed on Windows private key permissions [GH-9769]
- middleware/authentication: Prevent URL modification when no changes are required [GH-9730]
- middleware/authentication: Ignore URLs which cannot be parsed [GH-9739]
- provider/hyperv: Reference switches by ID instead of name [GH-9747]
- provider/docker: Use Util::SafeExec if docker-exec is run with -t option [GH-9761]
- provisioner/chef: Trim drive letter from path on Windows [GH-9766]
- provisioner/puppet: Properly finalize structured_facts config option [GH-9720]
- util/platform: Fix original WSL to Windows path for "root" directory [GH-9696]
-------------------------------------------------------------------
Mon Jun 4 07:26:24 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to 2.0.4
FEATURES:
- core: Vagrant aliases [GH-9504]
IMPROVEMENTS:
- communicators/ssh: Update file permissions when generating new key pairs [GH-9676]
- core: Make resolv-replace usage opt-in instead of opt-out [GH-9644]
- core: Suppress error messages from checkpoint runs [GH-9645]
- guests/coreos: Identify operating systems closely related to CoreOS [GH-9600]
- guests/debian: Adjust network configuration file prefix to 50- [GH-9646]
- guests/photon: Less specific string grep to fix PhotonOS 2.0 detection [GH-9528]
- guests/windows: Fix slow timeout when updating windows hostname [GH-9578]
- hosts/windows: Make powershell version detection timeout configurable [GH-9506]
- providers/virtualbox: Improve network collision error message [GH-9685]
- provisioner/chef_solo: Improve Windows drive letter removal hack for remote paths[GH-9490]
- provisioner/chef_zero: File path expand all chef_zero config path options [GH-9690]
- provisioner/puppet: Puppet structured facts toyaml on provisioner [GH-9670]
- provisioner/salt: Add master_json_config & minion_json_config options [GH-9420]
- util/platform: Warn on ArgumentError exceptions from encoding [GH-9506]
BUG FIXES:
- commands/package: Fix uninitialized constant error [GH-9654]
- communicators/winrm: Fix command filter to properly parse commands [GH-9673]
- hosts/windows: Properly respect the VAGRANT_PREFER_SYSTEM_BIN environment variable [GH-9503]
- hosts/windows: Fix virtualbox shared folders path for windows guests [GH-8099]
- guests/freebsd: Fix typo in command that manages configuring networks [GH-9705]
- util/checkpoint_client: Respect VAGRANT_CHECKPOINT_DISABLE environment variable [GH-9659]
- util/platform: Use --version instead of version for WSL validation [GH-9674]
- rebased patch 0024-do-not-depend-on-wdm.patch
-------------------------------------------------------------------
Mon Jun 4 06:09:16 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to version 2.0.3
-> removed patch 0006-Relax-dependency-resolution.patch
IMPROVEMENTS:
- guests/solaris: More explicit Solaris 11 and inherit SmartOS from Solaris [GH-9398]
- hosts/windows: Add support for latest WSL release [GH-9525, GH-9300]
- plugins/login: Update middleware to re-map hosts and warn on custom server [GH-9499]
- providers/hyper-v: Exit if Hyper-V is enabled and VirtualBox provider is used [GH-9456]
- provisioners/salt: Change to a temporary directory before downloading script files [GH-9351]
- sycned_folders/nfs: Default udp to false when using version 4 [GH-8828]
- util/downloader: Notify on host redirect [GH-9344]
BUG FIXES:
- core: Use provider override when specifying box_version [GH-9502]
- guests/debian: Renew DHCP lease on hostname change [GH-9405]
- guests/debian: Point hostname to 127.0.1.1 in /etc/hosts [GH-9404]
- guests/debian: Update systemd? check for guest inspection [GH-9459]
- guests/debian: Use ip route in dhcp template [GH-8730]
- guests/gentoo: Disable if/netplugd when setting up a static ip on a gentoo guest using openrc [GH-9261]
- guests/openbsd: Atomically apply new hostname.if(5) [GH-9265]
- hosts/windows: Fix halt problem when determining powershell version on old powershells [GH-9470]
- hosts/windows: Convert to windows path if on WSL during vbox export [GH-9518]
- providers/virtualbox: Fix hostonly matching not respecting :name argument [GH-9302]
- util/credential_scrubber: Ignore empty strings [GH-9472, GH-9462]
-------------------------------------------------------------------
Mon Jun 4 06:03:31 UTC 2018 - opensuse_buildservice@ojkastl.de
- do no longer use /usr/share/vim/current for vagrant-vim, rather use the approach used by
package openSUSE:Leap:15.0/vim-plugins: %{_datadir}/vim/site/plugin/
-------------------------------------------------------------------
Sun May 13 19:54:25 UTC 2018 - opensuse_buildservice@ojkastl.de
- re-added vim_data_dir macro until there is a better way to do this
-------------------------------------------------------------------
Wed May 9 11:00:53 UTC 2018 - opensuse_buildservice@ojkastl.de
- removed definition for vim_data_dir from spec file, to get rid of conflicts with vim80 package
-------------------------------------------------------------------
Wed May 2 10:56:24 UTC 2018 - jengelh@inai.de
- Use noun phrase in summary.
- Substitute obsolete %__-type macro indirections.
-------------------------------------------------------------------
Thu Mar 1 21:34:53 UTC 2018 - opensuse_buildservice@ojkastl.de
- removed some files during %install to avoid warnings on SLES12/Leap42.x
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to version 2.0.2
-> removed patch 0001-Disable-Checkpoint.patch that has been upstreamed
-> removed patch 0031-allow-builds-with-ruby2.5.patch
FEATURES:
- core: Provide mechanism for removing sensitive data from output [GH-9276]
- core: Relax Ruby constraints to include 2.5 [GH-9363]
- core: Hide sensitive values in output [GH-9369]
- command/init: Support custom Vagrantfile templates [GH-9202]
- guests: Add support for the Haiku operating system [GH-7805, GH-9245]
- synced_folders/smb: Add support for macOS hosts [GH-9294]
- vagrant-spec: Update vagrant-spec to include Windows platforms and updated linux boxes [GH-9183]
IMPROVEMENTS:
- config/ssh: Deprecate :paranoid in favor of :verify_host_key [GH-9341]
- core: Add optional timestamp prefix on log output [GH-9269]
- core: Print more helpful error message for NameEror exceptions in Vagrantfiles [GH-9252]
- core: Update checkpoint implementation to announce updates and support notifications [GH-9380]
- core: Use Ruby's Resolv by default [GH-9394]
- docs: Include virtualbox 5.2.x as supported in docs [GH-9237]
- docs: Improve how to pipe debug log on powershell [GH-9330]
- guests/amazon: Improve guest detection [GH-9307]
- guests/debian: Update guest configure networks [GH-9338]
- guests/dragonflybsd: Base guest on FreeBSD to inherit more functionality [GH-9205]
- guests/linux: Improve NFS service name detection and interactions [GH-9274]
- guests/linux: Support mount option overrides for SMB mounts [GH-9366]
- guests/linux: Use `ip` for reading guest address if available [GH-9315]
- guests/solaris: Improve guest detection for alternatives [GH-9295]
- hosts/windows: Check credentials during SMB prepare [GH-9365]
- providers/hyper-v: Ensure Hyper-V cmdlets are fully qualified [GH-8863]
- middleware/authentication: Add app.vagrantup.com to allowed hosts [GH-9145]
- provisioners/shell: Support hiding environment variable values in output [GH-9367]
- providers/virtualbox: Add a clean error message for invalid IP addresses [GH-9275]
- providers/virtualbox: Introduce flag for SharedFoldersEnableSymlinksCreate setting [GH-9354]
- providers/virtualbox: Provide warning for SharedFoldersEnableSymlinksCreate setting [GH-9389]
- provisioners/salt: Fixes timeout issue in salt bootstrapping for windows [GH-8992]
- synced_folders/smb: Update Windows implementation [GH-9294]
- util/ssh: Attempt to locate local ssh client before attempting installer provided [GH-9400]
BUG FIXES:
- commands/box: Show all box providers with `update outdated --global` [GH-9347]
- commands/destroy: Exit 0 if vagrant destroy finds no running vms [GH-9251]
- commands/package: Fix --output path with specified folder [GH-9131]
- guests/suse: Do not use full name when setting hostname [GH-9212]
- providers/hyper-v: Fix enable virtualization extensions on import [GH-9255]
- provisioners/ansible(both): Fix broken 'ask_sudo_pass' option [GH-9173]
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
- added patch 0031-allow-builds-with-ruby2.5.patch to allow building with ruby2.5
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to version 2.0.1
FEATURES:
core: Introduce Ruby 2.4 to Vagrant [GH-9102]
providers/virtualbox: Virtualbox 5.2 support [GH-8955]
IMPROVEMENTS:
command/destroy: Introduce parallel destroy for certain providers [GH-9127]
communicators/winrm: Include APIPA check within ready check [GH-8997]
core: Clear POSIXLY_CORRECT when using optparse [GH-8685]
docs: Add auto_start_action and auto_stop_action to docs. [GH-9029]
docs: Fix typo in box format doc [GH-9100]
provisioners/chef: Handle chef provisioner reboot request [GH-8874]
providers/salt: Support Windows Salt Minions greater than 2016.x.x [GH-8926]
provisioners/salt: Add wget to bootstrap_salt options when fetching installer file [GH-9112]
provisioners/shell: Use ui.detail for displaying output [GH-8983]
util/downloader: Use CURL_CA_BUNDLE environment variable [GH-9135]
BUG FIXES:
communicators/ssh: Retry on Errno::EPIPE exceptions [GH-9065]
core: Rescue more exceptions when checking if port is open [GH-8517]
guests/solaris11: Inherit from Solaris guest and keep solaris11 specific methods [GH-9034]
guests/windows: Split out cygwin path helper for msys2/cygwin paths and ensure cygpath exists [GH-8972]
guests/windows: Specify expected shell when executing on guest (fixes winssh communicator usage) [GH-9012]
guests/windows: Include WinSSH Communicator when using insert_public_key [GH-9105]
hosts/windows: Check for vagrant.exe when validating versions within WSL [GH-9107, GH-8962]
providers/docker: Isolate windows check within executor to handle running through VM [GH-8921]
providers/hyper-v: Properly invoke Auto stop action [GH-9000]
provisioners/puppet: Fix winssh communicator support in puppet provisioner [GH-9014]
virtualbox/synced_folders: Allow synced folders to contain spaces in the guest path [GH-8995]
- removed patches, that have been merged upstream
- 0010-virtualbox-5.2-support.patch
- 0020-also-build-with-ruby2.4.patch
- 0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch
- 0022-Do-not-use-deprecated-API.patch
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to version 2.0.0
IMPROVEMENTS:
commands/login: Add support for two-factor authentication [GH-8935]
commands/ssh-config: Properly display windows path if invoked from msys2 or cygwin [GH-8915]
guests/alt: Add support for ALT Linux [GH-8746]
guests/kali: Fix file permissions on guest plugin ruby files [GH-8950]
hosts/linux: Provide common systemd detection for services interaction, fix NFS host interactions [GH-8938]
providers/salt: Remove duplicate stdout, stderr output from salt [GH-8767]
providers/salt: Introduce salt_call_args and salt_args option for salt provisioner [GH-8927]
providers/virtualbox: Improving resilience of some VirtualBox commands [GH-8951]
provisioners/ansible(both): Add the compatibility_mode option, with auto-detection enabled by default [GH-8913, GH-6570]
provisioners/ansible: Add the version option to the host-based provisioner [GH-8913, GH-8914]
provisioners/ansible(both): Add the become and become_user options with deprecation of sudo and sudo_user options [GH-8913, GH-6570]
provisioners/ansible: Add the ask_become_pass option with deprecation of the ask_sudo_pass option [GH-8913, GH-6570]
BUG FIXES:
guests/shell_expand_guest_path : Properly expand guest paths that include relative path alias [GH-8918]
hosts/linux: Remove duplicate export folders before writing /etc/exports [GH-8945]
provisioners/ansible(both): Add single quotes to the inventory host variables, only when necessary [GH-8597]
provisioners/ansible(both): Add the "all:vars" section to the inventory when defined in groups option [GH-7730]
provisioners/ansible_local: Extra variables are no longer truncated when a dollar ($) character is present [GH-7735]
provisioners/file: Align file provisioner functionality on all platforms [GH-8939]
util/ssh: Properly quote key path for IdentityFile option to allow for spaces [GH-8924]
BREAKING CHANGES:
Both Ansible provisioners are now capable of automatically setting the compatibility_mode that best fits with the Ansible version in use. You may encounter some compatibility issues when upgrading. If you were using Ansible 2.x and referring to the _ssh-prefixed variables present in the generated inventory (e.g. ansible_ssh_host). In this case, you can fix your Vagrant setup by setting compatibility_mode = "1.8", or by migrating to the new variable names (e.g. ansible_host).
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to version 1.9.8 (August 23, 2017)
IMPROVEMENTS:
bash: Add box prune to contrib bash completion [GH-8806]
commands/login: Ask for description of Vagrant Cloud token [GH-8876]
commands/validate: Improve functionality of the validate command [GH-8889]n
core: Updated Vagrants rspec gem to 3.5.0 [GH-8850]
core: Validate powershell availability and version before use [GH-8839]
core: Introduce extra_args setting for ssh configs [GH-8895]
docs: Align contrib/sudoers file for ubuntu linux with docs [GH-8842]
provider/hyperv: Prefer IPv4 guest address [GH-8831, GH-8759]
provisioners/chef: Add config option omnibus_url for chef provisioners [GH-8682]
provisioners/chef: Improve exception handling around missing folder paths [GH-8775]
BUG FIXES:
box/update: Add force flag for box upgrade command [GH-8871]
commands/rsync-auto: Ensure relative dirs are still rsync'd if defined [GH-8781]
commands/up: Disable install providers when using global id on vagrant up [GH-8910]
communicators/winssh: Fix public key insertion to retain ACL [GH-8790]
core: Update util/ssh to use -o for identity files [GH-8786]
guests/freebsd: Fix regex for listing network devices on some FreeBSD boxes. [GH-8760]
hosts/windows: Prevent control characters in version check for WSL [GH-8902, GH-8901]
providers/docker: Split String type links into Array when using compose [GH-8837, GH-8821]
providers/docker: Expand relative volume paths correctly [GH-8838, GH-8822]
providers/docker: Error when compose option enabled with force_host_vm [GH-8911]
provisioners/ansible: Update to use -o for identity files [GH-8786]
provisioners/file: Ensure remote folder exists prior to scp file or folder [GH-8880]
provisioners/salt: Fix error case when github is unreachable for installer [GH-8864]
provisioners/shell: Allow frozen string scripts [GH-8875]
provisioners/puppet: Remove --manifestdir flag from puppet apply in provisioner [GH-8797]
synced_folders/rsync: Correctly format IPv6 host [GH-8840, GH-8809]
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
- tried to nail down the BuildReqire dependencies where possible,
to avoid build failures due to mismatches between BuildRequires
and vagrant's own dependencies in vagrant.gemspec
-------------------------------------------------------------------
Tue Jan 30 08:17:11 UTC 2018 - robert.munteanu@gmail.com

139
vagrant.spec
View File

@ -19,60 +19,74 @@
%define mod_name vagrant
%define mod_full_name %{mod_name}-%{version}
%{!?vim_data_dir:%global vim_data_dir /usr/share/vim/%(readlink /usr/share/vim/current)}
#
# Use
#
%global vim_data_dir %{_datadir}/vim/site/plugin/
Name: vagrant
Version: 1.9.7
Version: 2.1.1
Release: 0
Summary: Build and distribute virtualized development environments
Summary: Tool for building and distributing virtualized development environments
License: MIT
Group: Development/Languages/Ruby
Url: https://github.com/mitchellh/vagrant
Source0: https://github.com/mitchellh/vagrant/archive/v%{version}/%{mod_name}-%{version}.tar.gz
Source2: vagrant.1
Source3: README.SUSE
Url: https://github.com/hashicorp/vagrant
Source0: https://github.com/hashicorp/vagrant/archive/v%{version}.tar.gz#/%{mod_name}-%{version}.tar.gz
Source11: vagrant.1
Source98: README.SUSE
Source99: %{name}-rpmlintrc
Provides: rubygem-vagrant = %{version}
Obsoletes: rubygem-vagrant < %{version}
Recommends: vagrant-libvirt
#
Patch1: 0001-Disable-Checkpoint.patch
Patch2: 0002-bin-vagrant-silence-warning-about-installer.patch
Patch3: 0003-Use-a-private-temporary-dir.patch
Patch4: 0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
Patch6: 0006-Relax-dependency-resolution.patch
Patch8: 0008-Read-data-from-usr-share-vagrant.patch
Patch9: 0009-plugins-don-t-abuse-require_relative.patch
Patch10: 0010-virtualbox-5.2-support.patch
#
#
# try building with ruby2.4
Patch20: 0020-also-build-with-ruby2.4.patch
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
Patch26: 0026-remove-dependency-on-win32-file.patch
Patch27: 0027-now-use-rubygem-net-ssh-5.0.x.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 }
# s.add_dependency "childprocess", "~> 0.6.0"
BuildRequires: %{rubygem childprocess:0.6 }
BuildRequires: %{rubygem crack }
# Prevent have choice for rubygem(ruby:2.2.0:erubis)
BuildRequires: %{rubygem erubis >= 2.7}
BuildRequires: %{rubygem fake_ftp < 0.3}
BuildRequires: %{rubygem hashicorp-checkpoint}
BuildRequires: %{rubygem i18n <= 0.8 }
BuildRequires: %{rubygem listen >= 3.1.5}
BuildRequires: %{rubygem log4r}
# Prevent have choice for rubygem(ruby:2.2.0:net-scp)
BuildRequires: %{rubygem net-scp >= 1.2}
BuildRequires: %{rubygem net-sftp}
BuildRequires: %{rubygem net-ssh:4.1}
# 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 "listen", "~> 3.1.5"
BuildRequires: %{rubygem listen:3.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-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}
# Prevent have choice for rubygem(ruby:2.1.0:mime-types) >= 1.16
@ -82,20 +96,31 @@ 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
# inotify should go here
#BuildRequires: %{rubygem rb-kqueue}
BuildRequires: %{rubygem rake <= 12.0 }
BuildRequires: %{rubygem rake >= 11.3 }
BuildRequires: %{rubygem rb-kqueue }
BuildRequires: %{rubygem rest-client}
BuildRequires: %{rubygem rspec <= 2.15 }
# 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 }
BuildRequires: %{rubygem webmock }
BuildRequires: %{rubygem winrm }
BuildRequires: %{rubygem winrm-elevated }
BuildRequires: %{rubygem winrm-fs }
# 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}
# Prevent have choice for rubygem(ruby:2.2.0:erubis)
@ -109,7 +134,6 @@ Requires: %{rubygem net-sftp}
Requires: %{rubygem net-ssh}
# Prevent have choice for rubygem(ruby:2.2.0:nokogiri)
Requires: %{rubygem nokogiri >= 1.7}
# inotify should go here
#Requires: %{rubygem rb-kqueue0}
Requires: %{rubygem rest-client}
# We don't require rubygem mime-types since it's pulled in transitively
@ -148,6 +172,7 @@ Optional dependency offering emacs syntax files for Vagrantfile
Summary: Vagrant bash autocompletion
Group: Development/Languages/Ruby
Supplements: packageand(vagrant:bash)
BuildRequires: bash
Requires: bash
BuildArch: noarch
@ -156,31 +181,26 @@ Optional dependency offering bash completion for vagrant
%prep
%setup -q -n %{mod_full_name}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch6 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
#
#
#
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
cp %{SOURCE3} .
cp %{SOURCE98} .
%build
mv %{mod_name}.gemspec %{mod_full_name}.gemspec
%gem_build
mv %{mod_full_name}.gem %{_sourcedir}
bundle exec bin/vagrant --version
%install
# Tumbleweed OR Leap 42.2+
@ -190,20 +210,22 @@ bundle exec bin/vagrant --version
%gem_install -f
%endif
%{__mkdir_p} %{buildroot}%{_mandir}/man1
install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/vagrant.1
mkdir -p %{buildroot}/%{_mandir}/man1
install -m 644 %{SOURCE11} %{buildroot}%{_mandir}/man1/vagrant.1
install -D -d -m 0755 \
%{buildroot}%{_sysconfdir}/bash_completion.d/ \
%{buildroot}%{vim_data_dir}/plugin/ \
%{buildroot}%{_datadir}/emacs/site-lisp/
install -d -m 0777 \
%{buildroot}%{vim_data_dir}/ \
mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/bash/completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/%{mod_name}.sh
mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/vim/vagrantfile.vim %{buildroot}%{vim_data_dir}/plugin/%{mod_name}.vim
mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/vim/vagrantfile.vim %{buildroot}%{vim_data_dir}/%{mod_name}.vim
mv %{buildroot}%{gem_base}/gems/%{mod_full_name}/contrib/emacs/vagrant.el %{buildroot}%{_datadir}/emacs/site-lisp/%{mod_name}.el
# Tumbleweed OR Leap 42.2+
%if %suse_version >= 1320 || 0%{?sle_version} >= 120200
%if %suse_version >= 1320 || 0%{?sle_version} >= 120000
mv -v %{buildroot}%{_bindir}/vagrant.%{rb_default_ruby_suffix} %{buildroot}%{_bindir}/vagrant
%endif
@ -217,8 +239,19 @@ install -m 644 version.txt %{buildroot}%{_datadir}/%{name}
mkdir -p %{buildroot}%{_datadir}/%{name}-plugins/plugins.d
echo "{}" > %{buildroot}%{_datadir}/%{name}-plugins/plugins.json
rm -rf %{buildroot}%{gem_base}/gems/%{mod_full_name}/.travis.yml
rm -rf %{buildroot}%{gem_base}/gems/%{mod_full_name}/.gitignore
rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/.travis.yml
rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/.gitignore
rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/test/vagrant-spec/boxes/.keep
rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/bin/vagrant.orig
rm -f %{buildroot}%{_bindir}/vagrant.orig.%{rb_default_ruby_suffix}
rm -f %{buildroot}%{gem_base}/gems/%{mod_full_name}/lib/vagrant/util.rb.orig
# change shebang in /usr/lib64/ruby/gems/*/gems/vagrant-2.1.1/.runner.sh
sed -i '1 s/^.*$/#!\/bin\/bash/' %{buildroot}%{gem_base}/gems/%{mod_full_name}/.runner.sh
# change shebang in /etc/bash_completion.d/vagrant.sh
sed -i '1d' %{buildroot}%{_sysconfdir}/bash_completion.d/%{mod_name}.sh
%files
%defattr(-,root,root,-)
@ -236,7 +269,7 @@ rm -rf %{buildroot}%{gem_base}/gems/%{mod_full_name}/.gitignore
%files vim
%defattr(-,root,root,-)
%{vim_data_dir}/plugin/%{mod_name}.vim
%{vim_data_dir}/%{mod_name}.vim
%files emacs
%defattr(-,root,root,-)