diff --git a/0024-do-not-depend-on-wdm.patch b/0024-do-not-depend-on-wdm.patch index 6358aa4..e43304d 100644 --- a/0024-do-not-depend-on-wdm.patch +++ b/0024-do-not-depend-on-wdm.patch @@ -1,4 +1,4 @@ -From 92ee846e1d5da65c75af6efef3f5ebdfa367158a Mon Sep 17 00:00:00 2001 +From 1bc55fc60cf48b0d9b01a7a7a24ba92e6fc910c1 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 4096fd684..6b8736f6a 100644 +index edc12f032..5f60fd0d8 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -27,7 +27,6 @@ Gem::Specification.new do |s| @@ -17,9 +17,9 @@ index 4096fd684..6b8736f6a 100644 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 +2.18.0 diff --git a/0026-remove-dependency-on-win32-file.patch b/0026-remove-dependency-on-win32-file.patch deleted file mode 100644 index f4a43d8..0000000 --- a/0026-remove-dependency-on-win32-file.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e00908d36792ba0736ba20c3e1ebbf974a564cb2 Mon Sep 17 00:00:00 2001 -From: Johannes Kastl -Date: Mon, 4 Jun 2018 11:04:54 +0200 -Subject: [PATCH] remove dependency on win32-file* - -Signed-off-by: Johannes Kastl ---- - 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 - diff --git a/vagrant-2.1.1.tar.gz b/vagrant-2.1.1.tar.gz deleted file mode 100644 index 56aaf60..0000000 --- a/vagrant-2.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b54b39ad2bdfe038f5a6767a745f2139d6f62e6e4745008e906f2e1c658fa4d -size 1204711 diff --git a/vagrant-2.1.2.tar.gz b/vagrant-2.1.2.tar.gz new file mode 100644 index 0000000..e5fd172 --- /dev/null +++ b/vagrant-2.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:610d704e737cbc0ccb9d27fd1b40be8bb1917cad693d2a3d841c8c36c8066939 +size 1218801 diff --git a/vagrant.changes b/vagrant.changes index 245a78f..0b4b8b7 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Sun Jul 8 19:38:30 UTC 2018 - opensuse_buildservice@ojkastl.de + +- added Reqires for exact vagrant version to subpackages vagrant-vim, vagrant-emacs and vagrant-bash-completion + +------------------------------------------------------------------- +Sun Jul 8 19:36:10 UTC 2018 - opensuse_buildservice@ojkastl.de + +- removed patch 0026-remove-dependency-on-win32-file.patch + +------------------------------------------------------------------- +Sun Jul 8 19:25:06 UTC 2018 - opensuse_buildservice@ojkastl.de + +- update to 2.1.2 + IMPROVEMENTS + - commands/suspend: Introduce flag for suspending all machines [GH-9829] + - commands/global-status: Improve message about removing stale entries [GH-9856] + - provider/hyperv: Attempt to determine import failure cause [GH-9936] + - provider/hyperv: Update implementation. Include support for modifications on reload [GH-9872] + - provider/hyperv: Validate maxmemory configuration setting [GH-9932] + - provider/hyperv: Enable provider within WSL [GH-9943] + - provider/hyperv: Add Hyper-V accessibility check on data directory path [GH-9944] + - provisioners/ansible_local: Improve installation from PPA on Ubuntu guests. The compatibility is maintained only for active long-term support (LTS) versions, i.e. Ubuntu 12.04 (Precise Pangolin) is no longer supported. [GH-9879] + + BUG FIXES: + - communicator/ssh: Update ssh private key file permission handling on Windows [GH-9923, GH-9900] + - core: Display plugin commands in help [GH-9808] + - core: Ensure guestpath or name is set with synced_folder option and dont set guestpath if not provided [GH-9692] + - guest/debian: Fix netplan generation when using DHCP [GH-9855] + - guest/debain: Update priority of network configuration file when using networkd [GH-9867] + - guest/ubuntu: Update netplan config generation to detect NetworkManager [GH-9824] + - guest/ubuntu: Fix failing Ansible installation from PPA on Bionic Beaver (18.04 LTS) [GH-9796] + - host/windows: Prevent processing of last SMB line when using net share [GH-9917] + - provisioner/chef: Prevent node_name set on configuration with chef_apply [GH-9916] + - provisioner/salt: Remove usage of masterless? config attribute [GH-9833] + ------------------------------------------------------------------- Sun Jul 1 16:55:53 UTC 2018 - opensuse_buildservice@ojkastl.de diff --git a/vagrant.spec b/vagrant.spec index cb3867b..483fdd9 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -25,7 +25,7 @@ %global vim_data_dir %{_datadir}/vim/site/plugin/ Name: vagrant -Version: 2.1.1 +Version: 2.1.2 Release: 0 Summary: Tool for building and distributing virtualized development environments License: MIT @@ -50,7 +50,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 -Patch26: 0026-remove-dependency-on-win32-file.patch Patch27: 0027-now-use-rubygem-net-ssh-5.0.x.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -151,6 +150,7 @@ Summary: Vagrantfile syntax files for the vim editor Group: Development/Languages/Ruby Supplements: packageand(vagrant:vim) BuildRequires: vim +Requires: vagrant = %{version} Requires: vim BuildArch: noarch @@ -162,6 +162,7 @@ Summary: Vagrantfile syntax files for the emacs editor Group: Development/Languages/Ruby Supplements: packageand(vagrant:emacs_program) BuildRequires: emacs-nox +Requires: vagrant = %{version} Requires: emacs_program BuildArch: noarch @@ -173,6 +174,7 @@ Summary: Vagrant bash autocompletion Group: Development/Languages/Ruby Supplements: packageand(vagrant:bash) BuildRequires: bash +Requires: vagrant = %{version} Requires: bash BuildArch: noarch @@ -192,7 +194,6 @@ Optional dependency offering bash completion for vagrant %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 %patch27 -p1 cp %{SOURCE98} .