diff --git a/0002-bin-vagrant-silence-warning-about-installer.patch b/0002-bin-vagrant-silence-warning-about-installer.patch index e5765bb..cd1d661 100644 --- a/0002-bin-vagrant-silence-warning-about-installer.patch +++ b/0002-bin-vagrant-silence-warning-about-installer.patch @@ -1,4 +1,4 @@ -From 246fe8ff4bb69cfffa7e44e4e571f2febc5e7719 Mon Sep 17 00:00:00 2001 +From d48c50fb28325a7fbd9499b73f27ed85db01c680 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Sat, 11 Oct 2014 16:54:58 -0300 Subject: [PATCH] bin/vagrant: silence warning about installer @@ -9,10 +9,10 @@ Signed-off-by: Johannes Kastl 1 file changed, 16 deletions(-) diff --git a/bin/vagrant b/bin/vagrant -index 19df75033..6667ab152 100755 +index 7372a726d..0e3a16c0f 100755 --- a/bin/vagrant +++ b/bin/vagrant -@@ -117,22 +117,6 @@ begin +@@ -143,22 +143,6 @@ begin logger.debug("Creating Vagrant environment") env = Vagrant::Environment.new(opts) @@ -36,5 +36,5 @@ index 19df75033..6667ab152 100755 # Execute the CLI interface, and exit with the proper error code exit_status = env.cli(argv) -- -2.13.0 +2.19.1 diff --git a/0003-Use-a-private-temporary-dir.patch b/0003-Use-a-private-temporary-dir.patch index 3e4f382..e9591f3 100644 --- a/0003-Use-a-private-temporary-dir.patch +++ b/0003-Use-a-private-temporary-dir.patch @@ -1,4 +1,4 @@ -From 7ceb61fdbfc9e62e199e4f306474ba5b65f080c9 Mon Sep 17 00:00:00 2001 +From 8a6215a36bcd19312606b231a9392ab90d1d03e3 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Wed, 22 Oct 2014 09:40:14 -0200 Subject: [PATCH] Use a private temporary dir @@ -10,7 +10,7 @@ Signed-off-by: Johannes Kastl --- lib/vagrant/box.rb | 3 ++- lib/vagrant/util.rb | 2 ++ - lib/vagrant/util/tempfile.rb | 39 +++++++++++++++++++++++++++++++++++++++ + lib/vagrant/util/tempfile.rb | 39 ++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 lib/vagrant/util/tempfile.rb @@ -36,10 +36,10 @@ index cd839ee91..65eee8828 100644 url = @metadata_url diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb -index 313e1bd19..6e6f669f4 100644 +index 32babe50d..217469e85 100644 --- a/lib/vagrant/util.rb +++ b/lib/vagrant/util.rb -@@ -13,6 +13,8 @@ module Vagrant +@@ -15,6 +15,8 @@ module Vagrant autoload :SafeExec, 'vagrant/util/safe_exec' autoload :SilenceWarnings, 'vagrant/util/silence_warnings' autoload :StackedProcRunner, 'vagrant/util/stacked_proc_runner' @@ -94,5 +94,5 @@ index 000000000..0cbbb53ac + FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir) +end -- -2.13.0 +2.19.1 diff --git a/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch b/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch index a48cd38..ccaa6bf 100644 --- a/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch +++ b/0004-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch @@ -1,4 +1,4 @@ -From 68b48e8ac3316ea157e28a3b02b38f3334a7d985 Mon Sep 17 00:00:00 2001 +From d6fdea5990cb0a8c3d37299b6d0f4be3bfa7fe94 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 3 Feb 2015 10:35:17 -0200 Subject: [PATCH] linux/cap/halt: don't wait for `shutdown -h now` to finish @@ -26,5 +26,5 @@ index 60dc5dde4..657636eaf 100644 # Do nothing, because it probably means the machine shut down # and SSH connection was lost. -- -2.13.0 +2.19.1 diff --git a/0008-Read-data-from-usr-share-vagrant.patch b/0008-Read-data-from-usr-share-vagrant.patch deleted file mode 100644 index e0955dd..0000000 --- a/0008-Read-data-from-usr-share-vagrant.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3597147739d63a6ed9006ab461bcb92afc8f834f Mon Sep 17 00:00:00 2001 -From: Antonio Terceiro -Date: Sat, 11 Oct 2014 16:55:21 -0300 -Subject: [PATCH] Read data from /usr/share/vagrant - -Signed-off-by: Johannes Kastl ---- - lib/vagrant/shared_helpers.rb | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb -index 5522272d3..305d73db1 100644 ---- a/lib/vagrant/shared_helpers.rb -+++ b/lib/vagrant/shared_helpers.rb -@@ -85,7 +85,17 @@ module Vagrant - # - # @return [Pathname] - def self.source_root -- @source_root ||= Pathname.new(File.expand_path('../../../', __FILE__)) -+ @source_root ||= -+ begin -+ source = Pathname.new(File.expand_path('../../../', __FILE__)) -+ if source.join('debian/control').exist? -+ # working inside source package -+ source -+ else -+ # installed -+ Pathname.new('/usr/share/vagrant') -+ end -+ end - end - - # This returns the path to the ~/.vagrant.d folder where Vagrant's --- -2.13.0 - diff --git a/0009-plugins-don-t-abuse-require_relative.patch b/0009-plugins-don-t-abuse-require_relative.patch index 538036e..4bae492 100644 --- a/0009-plugins-don-t-abuse-require_relative.patch +++ b/0009-plugins-don-t-abuse-require_relative.patch @@ -1,4 +1,4 @@ -From 9a3b6124412483cd2fa3779fade3387e96917caf Mon Sep 17 00:00:00 2001 +From 9e55cb6868769a851397bc6f049dad3a1a431af2 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Wed, 17 May 2017 09:09:57 +0200 Subject: [PATCH] plugins-don-t-abuse-require_relative.patch @@ -32,7 +32,7 @@ index 0ef71d55f..df0bd0f8f 100644 module VagrantPlugins module GuestArch diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb -index 99d6681de..3b582b159 100644 +index 35ffba2d2..c09c59518 100644 --- a/plugins/guests/debian/cap/configure_networks.rb +++ b/plugins/guests/debian/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -44,7 +44,7 @@ index 99d6681de..3b582b159 100644 module VagrantPlugins module GuestDebian diff --git a/plugins/guests/freebsd/cap/configure_networks.rb b/plugins/guests/freebsd/cap/configure_networks.rb -index 8e5627b5e..f9e761ee7 100644 +index 36b11d1ed..866f8503a 100644 --- a/plugins/guests/freebsd/cap/configure_networks.rb +++ b/plugins/guests/freebsd/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -106,7 +106,7 @@ index 96458622f..ed371765e 100644 module VagrantPlugins module GuestNixos diff --git a/plugins/guests/openbsd/cap/configure_networks.rb b/plugins/guests/openbsd/cap/configure_networks.rb -index 30c4be060..64989d103 100644 +index fefc05b9e..a3bfcaf48 100644 --- a/plugins/guests/openbsd/cap/configure_networks.rb +++ b/plugins/guests/openbsd/cap/configure_networks.rb @@ -1,6 +1,6 @@ @@ -154,5 +154,5 @@ index 2dd140230..e6dd96f08 100644 module VagrantPlugins module GuestSUSE -- -2.13.0 +2.19.1 diff --git a/0023-vbox-fix-package.patch b/0023-vbox-fix-package.patch index 80dc224..bf44b7e 100644 --- a/0023-vbox-fix-package.patch +++ b/0023-vbox-fix-package.patch @@ -1,15 +1,29 @@ -diff -ur vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package.rb vagrant-1.9.7/plugins/providers/virtualbox/action/package.rb ---- vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package.rb 2017-08-16 11:52:01.270242802 +0300 -+++ vagrant-1.9.7/plugins/providers/virtualbox/action/package.rb 2017-08-16 11:53:08.929783075 +0300 +From 12fb619f0a0ef2843900a5ecb661385a8b4e3dcc Mon Sep 17 00:00:00 2001 +From: Johannes Kastl +Date: Fri, 16 Nov 2018 21:12:43 +0100 +Subject: [PATCH] fix vbox package boo#1044087, added by + robert.munteanu@gmail.com on Sun Aug 13 19:07:06 UTC 2017 + +Signed-off-by: Johannes Kastl +--- + plugins/providers/virtualbox/action/package.rb | 2 +- + plugins/providers/virtualbox/action/package_setup_folders.rb | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/providers/virtualbox/action/package.rb b/plugins/providers/virtualbox/action/package.rb +index fb5ebdabf..c03c1c373 100644 +--- a/plugins/providers/virtualbox/action/package.rb ++++ b/plugins/providers/virtualbox/action/package.rb @@ -1,4 +1,4 @@ -require_relative "../../../../lib/vagrant/action/general/package" +require "vagrant/action/general/package" module VagrantPlugins module ProviderVirtualBox -diff -ur vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package_setup_folders.rb vagrant-1.9.7/plugins/providers/virtualbox/action/package_setup_folders.rb ---- vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package_setup_folders.rb 2017-08-16 11:52:01.270242802 +0300 -+++ vagrant-1.9.7/plugins/providers/virtualbox/action/package_setup_folders.rb 2017-08-16 11:52:51.353902487 +0300 +diff --git a/plugins/providers/virtualbox/action/package_setup_folders.rb b/plugins/providers/virtualbox/action/package_setup_folders.rb +index a0baf516f..867fe2bf8 100644 +--- a/plugins/providers/virtualbox/action/package_setup_folders.rb ++++ b/plugins/providers/virtualbox/action/package_setup_folders.rb @@ -1,6 +1,6 @@ require "fileutils" @@ -18,3 +32,6 @@ diff -ur vagrant-1.9.7.orig/plugins/providers/virtualbox/action/package_setup_fo module VagrantPlugins module ProviderVirtualBox +-- +2.19.1 + diff --git a/0024-do-not-depend-on-wdm.patch b/0024-do-not-depend-on-wdm.patch index e43304d..3905b2a 100644 --- a/0024-do-not-depend-on-wdm.patch +++ b/0024-do-not-depend-on-wdm.patch @@ -1,4 +1,4 @@ -From 1bc55fc60cf48b0d9b01a7a7a24ba92e6fc910c1 Mon Sep 17 00:00:00 2001 +From f533a1d46affdf015c4034531d98d91650d74f17 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Mon, 4 Jun 2018 09:18:23 +0200 Subject: [PATCH] do not depend on wdm @@ -9,7 +9,7 @@ Signed-off-by: Johannes Kastl 1 file changed, 1 deletion(-) diff --git a/vagrant.gemspec b/vagrant.gemspec -index edc12f032..5f60fd0d8 100644 +index d67d1e83c..b12d85c51 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -27,7 +27,6 @@ Gem::Specification.new do |s| @@ -21,5 +21,5 @@ index edc12f032..5f60fd0d8 100644 s.add_dependency "winrm-fs", "~> 1.0" s.add_dependency "winrm-elevated", "~> 1.1" -- -2.18.0 +2.19.1 diff --git a/0025-do-not-abuse-relative-paths-in-docker-plugin.patch b/0025-do-not-abuse-relative-paths-in-docker-plugin.patch index be0fe7e..4bdc5d6 100644 --- a/0025-do-not-abuse-relative-paths-in-docker-plugin.patch +++ b/0025-do-not-abuse-relative-paths-in-docker-plugin.patch @@ -1,12 +1,26 @@ -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 +From c3b9fbbb7168003bdf09fa4e35652bbe308330d8 Mon Sep 17 00:00:00 2001 +From: Johannes Kastl +Date: Fri, 16 Nov 2018 21:14:46 +0100 +Subject: [PATCH] do not abuse relative paths in docker plugin to make docker + work, added by tmkn@tmkn.uk on Thu Oct 26 19:42:46 UTC 2017 + +Signed-off-by: Johannes Kastl +--- + plugins/providers/docker/config.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/providers/docker/config.rb b/plugins/providers/docker/config.rb +index b3b6993c6..f9b147597 100644 +--- a/plugins/providers/docker/config.rb ++++ b/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 +-- +2.19.1 + diff --git a/0027-now-use-rubygem-net-ssh-5.0.x.patch b/0027-now-use-rubygem-net-ssh-5.0.x.patch deleted file mode 100644 index c5b6e1e..0000000 --- a/0027-now-use-rubygem-net-ssh-5.0.x.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 54648b91f9531b6fd0a9639c0ec5d8331c79907c Mon Sep 17 00:00:00 2001 -From: Johannes Kastl -Date: Sun, 1 Jul 2018 15:21:34 +0200 -Subject: [PATCH] now use rubygem net-ssh 5.0.x - -Signed-off-by: Johannes Kastl ---- - 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 - diff --git a/vagrant-2.1.2.tar.gz b/vagrant-2.1.2.tar.gz deleted file mode 100644 index e5fd172..0000000 --- a/vagrant-2.1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:610d704e737cbc0ccb9d27fd1b40be8bb1917cad693d2a3d841c8c36c8066939 -size 1218801 diff --git a/vagrant-2.1.5.tar.gz b/vagrant-2.1.5.tar.gz new file mode 100644 index 0000000..14909e1 --- /dev/null +++ b/vagrant-2.1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:347179564f5a8a56e2d6dcb82470e04d92a60ed0b3265efc07f9ff37cd5c7f5f +size 1238788 diff --git a/vagrant.changes b/vagrant.changes index 0b4b8b7..e472a4e 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,109 @@ +------------------------------------------------------------------- +Fri Nov 16 21:04:23 UTC 2018 - Johannes Kastl + +- update to 2.1.5 + IMPROVEMENTS: + - core: Add `Vagrant.version?` helper method [GH-10191] + - core: Scrub sensitive values from logger output [GH-10200] + - core: Prevent multiple evaluations of Vagrantfile [GH-10199] + - command/init: Support VAGRANT_DEFAULT_TEMPLATE env var [GH-10171] + - command/powershell: Improve doc help string and fix winrm locales error [GH-10189] + - contrib/bash: autocomplete running VM names for destroy subcommand [GH-10168] + - guest/debian: Use `sudo` to determine if systemd is in use for hardened systems [GH-10198] + - guest/openbsd: Add IPv6 network template for OpenBSD machines [GH-8912] + - provisioners/salt: Allow non-windows hosts to pass along version [GH-10194] + + BUG FIXES: + - core: Fix Vagrant.has_plugin? behavior before plugins are initialized [GH-10165] + - core: Check verify_host_key for falsey or :never values when generating ssh config [GH-10182] + - guest/linux: Filter out empty strings and loopback interfaces when constructing list of network interfaces [GH-10092] + - provider/hyper-v: Check for automatic checkpoint support before configuring [GH-10181] + +------------------------------------------------------------------- +Fri Nov 16 20:55:33 UTC 2018 - Johannes Kastl + +- update to 2.1.4 + BUG FIXES: + - core: Fix local plugin installation prompt answer parsing [GH-10154] + - core: Reset internal environment after plugin loading [GH-10155] + - host/windows: Fix SMB list parsing when extra fields are included [GH-10156] + +------------------------------------------------------------------- +Fri Nov 16 20:39:55 UTC 2018 - Johannes Kastl + +- update to 2.1.3 + + FEATURES: + - core: Support for project specific plugins [GH-10037] + + IMPROVEMENTS: + - command\/reload: Add `--force` flag to reload command [GH-10123] + - communicator/winrm: Display warning if vagrant-winrm plugin is detected [GH-10076] + - contrib/bash: Replace -VAGRANTSLASH - with literal slash in completion [GH-9987] + - core: Show installed version of Vagrant when displaying version check [GH-9968] + - core: Retain information of original box backing active guest [GH-10083] + - core: Only write box info if provider supports box objects [GH-10126] + - core: Update net-ssh dependency constraint to ~> 5.0.0 [GH-10066] + - core/triggers: Catch and allow for non-standard exit codes with triggers `run` options [GH-10005] + - core/triggers: Allow for spaces in `path` for trigger run option [GH-10118] + - guest/debian: Isolate network interface configuration to individual files for systemd [GH-9889] + - guest/redhat: Use libnfs-utils package if available [GH-9878] + - provider/docker: Support Docker volume consistency for synced folders [GH-9811] + - provider/hyperv: Disable synced folders on non-DrvFs file systems by default [GH-10001] + - util/downloader: Support custom suffix on user agent string [GH-9966] + - util/downloader: Prevent false positive matches on Location header [GH-10041] + - util/subprocess: Force system library paths for executables external to AppImage [GH-10078] + + BUG FIXES: + - core: Disable Vagrantfile loading with plugin commands [GH-10030] + - core: Ensure the SecureRandom library is loaded for the trigger class [GH-10063] + - core/triggers: Allow trigger run args option to be a single string [GH-10116] + - util/powershell: Properly `join` commands from passed in array [GH-10115] + - guest/solaris: Add back guest detection check for Solaris derived guests [GH-10081] + - guest/windows: Be more explicit when invoking cmd.exe with mount_volume script [GH-9976] + - host/linux: Fix sudo usage in NFS capability when modifying exports file [GH-10084] + - host/windows: Remove localization dependency from SMB list generation [GH-10043] + - provider/docker: Convert windows paths for volume mounts on docker driver [GH-10100] + - provider/hyperv: Fix checkpoint configuration and properly disable automatic checkpoints by default [GH-9999] + - provider/hyperv: Remove localization dependency from access check [GH-10000] + - provider/hyperv: Enable ExposeVirtualizationExtensions only when available [GH-10079] + - provider/virtualbox: Skip link-local when fixing IPv6 route [GH-9639, GH-10077] + - push/ftp: Custom error when attempting to push too many files [GH-9952] + - util/downloader: Prevent errors when Location header contains relative path [GH-10017] + - util/guest_inspection: Prevent nmcli check from hanging when pty is enabled [GH-9926] + - util/platform: Always force string type conversion on path [GH-9998] + +- removed patch 0007-Support-system-installed-plugins.patch that has been included upstream +- removed patch 0027-now-use-rubygem-net-ssh-5.0.x.patch that is no longer necessary + +------------------------------------------------------------------- +Fri Nov 9 20:24:19 UTC 2018 - Johannes Kastl + +- link directories from /usr/share/vagrant/ to /usr/lib64/ruby/gems/2.5.0/gems/x.y.z/, to avoid ruby errors due to patch 0007 + +------------------------------------------------------------------- +Fri Nov 9 20:19:31 UTC 2018 - Johannes Kastl + +- add Requires and BuildRequires for bash-completion to the vagrant-bash-completion subpackage +- move bash-completion file to %{_datadir}/bash-completion/completions/ to avoid warnings + +------------------------------------------------------------------- +Fri Nov 9 14:35:42 UTC 2018 - Johannes Kastl + +- use patch 0007-Support-system-installed-plugins.patch on tumbleweed only, as this seems to break Leap 15.0 systems + +------------------------------------------------------------------- +Wed Jul 11 18:38:49 UTC 2018 - opensuse_buildservice@ojkastl.de + +- added directory /usr/share/vagrant-plugins/plugins.d to spec file + +------------------------------------------------------------------- +Mon Jul 9 19:02:32 UTC 2018 - opensuse_buildservice@ojkastl.de + +- added patch 0007-Support-system-installed-plugins.patch, removed patch 0008-Read-data-from-usr-share-vagrant.patch + patch has been ported from Debians package for 2.0.2 + https://packages.debian.org/sid/vagrant + ------------------------------------------------------------------- Sun Jul 8 19:38:30 UTC 2018 - opensuse_buildservice@ojkastl.de diff --git a/vagrant.spec b/vagrant.spec index 483fdd9..da6629b 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -25,7 +25,7 @@ %global vim_data_dir %{_datadir}/vim/site/plugin/ Name: vagrant -Version: 2.1.2 +Version: 2.1.5 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT @@ -42,7 +42,6 @@ Recommends: vagrant-libvirt 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 -Patch8: 0008-Read-data-from-usr-share-vagrant.patch Patch9: 0009-plugins-don-t-abuse-require_relative.patch # # @@ -50,7 +49,6 @@ Patch9: 0009-plugins-don-t-abuse-require_relative.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 -Patch27: 0027-now-use-rubygem-net-ssh-5.0.x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # force only one ruby version @@ -174,8 +172,10 @@ Summary: Vagrant bash autocompletion Group: Development/Languages/Ruby Supplements: packageand(vagrant:bash) BuildRequires: bash +BuildRequires: bash-completion Requires: vagrant = %{version} Requires: bash +Requires: bash-completion BuildArch: noarch %description bash-completion @@ -186,7 +186,6 @@ Optional dependency offering bash completion for vagrant %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch8 -p1 %patch9 -p1 # # @@ -194,7 +193,6 @@ Optional dependency offering bash completion for vagrant %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch27 -p1 cp %{SOURCE98} . @@ -218,8 +216,10 @@ install -D -d -m 0755 \ %{buildroot}%{_sysconfdir}/bash_completion.d/ \ %{buildroot}%{_datadir}/emacs/site-lisp/ -install -d -m 0777 \ - %{buildroot}%{vim_data_dir}/ \ +install -d -m 0777 %{buildroot}%{vim_data_dir}/ + +install -d -m 0755 %{buildroot}%{_datadir}vagrant-plugins/ \ + %{buildroot}%{_datadir}vagrant-plugins/plugins.d 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}/%{mod_name}.vim @@ -253,6 +253,21 @@ sed -i '1 s/^.*$/#!\/bin\/bash/' %{buildroot}%{gem_base}/gems/%{mod_full_name}/. # change shebang in /etc/bash_completion.d/vagrant.sh sed -i '1d' %{buildroot}%{_sysconfdir}/bash_completion.d/%{mod_name}.sh +# move file to %{_datadir}/bash-completion/completions/ to avoid warnings +install -d 755 %{buildroot}%{_datadir}/bash-completion/completions/ +mv -v %{buildroot}%{_sysconfdir}/bash_completion.d/%{mod_name}.sh %{buildroot}%{_datadir}/bash-completion/completions/ + +%post +# link directories to avoid the following error: +# /usr/lib64/ruby/2.5.0/pathname.rb:444:in `open': No such file or directory @ dir_initialize - /usr/lib64/ruby/gems/2.5.0/gems/vagrant-2.1.2/plugins (Errno::ENOENT) +ln -s %{_datadir}/%{name}/keys %{gem_base}/gems/%{mod_full_name}/keys +ln -s %{_datadir}/%{name}/plugins %{gem_base}/gems/%{mod_full_name}/plugins +ln -s %{_datadir}/%{name}/templates %{gem_base}/gems/%{mod_full_name}/templates + +%postun +rm -f %{gem_base}/gems/%{mod_full_name}/keys +rm -f %{gem_base}/gems/%{mod_full_name}/plugins +rm -f %{gem_base}/gems/%{mod_full_name}/templates %files %defattr(-,root,root,-) @@ -278,6 +293,6 @@ sed -i '1d' %{buildroot}%{_sysconfdir}/bash_completion.d/%{mod_name}.sh %files bash-completion %defattr(-,root,root,-) -%config %{_sysconfdir}/bash_completion.d/%{mod_name}.sh +%{_datadir}/bash-completion/completions/%{mod_name}.sh %changelog