From 43150d34869dab800020ab604ca7c49efffa360c0969bd9247a0d57828ad8083 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sun, 10 Mar 2019 16:28:57 +0000
Subject: [PATCH] Accepting request 681748 from
 home:ammartinez:branches:Virtualization:vagrant

- Correct the gem versions

OBS-URL: https://build.opensuse.org/request/show/681748
OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=27
---
 vagrant.changes |  5 +++++
 vagrant.spec    | 35 +++++++++++++++++------------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/vagrant.changes b/vagrant.changes
index b05bcad..2f4c1f7 100644
--- a/vagrant.changes
+++ b/vagrant.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  4 14:43:17 UTC 2019 - Ana María Martínez Gómez <ammartinez@suse.com>
+
+- Correct the gem versions
+
 -------------------------------------------------------------------
 Mon Jan 28 13:31:45 UTC 2019 - Dan Čermák <dcermak@suse.com>
 
diff --git a/vagrant.spec b/vagrant.spec
index 43a08f0..f9b7040 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -65,46 +65,45 @@ BuildRequires:  %{ruby < 2.7}
 #
 BuildRequires:  %{rubygem bundler}
 #  s.add_dependency "bcrypt_pbkdf", "~> 1.0.0"
-BuildRequires:  %{rubygem bcrypt_pbkdf:1.0.0 }
+BuildRequires:  %{rubygem bcrypt_pbkdf:1.0 }
 #  s.add_dependency "childprocess", "~> 0.6.0"
 BuildRequires:  %{rubygem childprocess:0.6 }
 #  s.add_dependency "ed25519", "~> 1.2.4"
-BuildRequires:  %{rubygem ed25519:1.2.4 }
+BuildRequires:  %{rubygem ed25519:1.2 >= 1.2.4 }
 #  s.add_dependency "erubis", "~> 2.7.0"
 BuildRequires:  %{rubygem erubis:2.7 }
 #  s.add_dependency "i18n", "~> 1.1.1"
-BuildRequires:  %{rubygem i18n:1.1.1 }
+BuildRequires:  %{rubygem i18n:1.1 >= 1.1.1 }
 #  s.add_dependency "listen", "~> 3.1.5"
-BuildRequires:  %{rubygem listen:3.1.5 }
+BuildRequires:  %{rubygem listen:3.1 >= 3.1.5 }
 #  s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
-BuildRequires:  %{rubygem hashicorp-checkpoint:0.1.5 }
+BuildRequires:  %{rubygem hashicorp-checkpoint:0.1 >= 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 }
+BuildRequires:  %{rubygem log4r:1.1 >= 1.1.9 }
+BuildConflicts:  %{rubygem log4r:1.1 >= 1.1.11 }
 #  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 }
+BuildRequires:  %{rubygem net-sftp:2 >= 2.1 }
 #  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}
+BuildConflicts:  %{rubygem rest-client >= 3.0}
 #  s.add_dependency "rubyzip", "~> 1.2.2"
-BuildRequires:  %{rubygem rubyzip:1.2.2}
+BuildRequires:  %{rubygem rubyzip:1.2 >= 1.2.2}
 # Intentionally removed, wdm only works on Windows
 # BuildRequires:  %{rubygem wdm }
 #  s.add_dependency "winrm", "~> 2.1"
-BuildRequires:  %{rubygem winrm:2.1 }
+BuildRequires:  %{rubygem winrm:2 >= 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 }
+BuildRequires:  %{rubygem winrm-elevated:1 }
 #  s.add_dependency "vagrant_cloud", "~> 2.0.0"
-BuildRequires:  %{rubygem vagrant_cloud >= 2.0.0 }
-BuildRequires:  %{rubygem vagrant_cloud < 2.1.0 }
+BuildRequires:  %{rubygem vagrant_cloud:2.0 }
 
 # devel dependencies:
 #  s.add_development_dependency "rake", "~> 12.0.0"
@@ -116,9 +115,9 @@ 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 }
+BuildRequires:  %{rubygem webmock:2.3 >= 2.3.1 }
 #  s.add_development_dependency "fake_ftp", "~> 0.1.1"
-BuildRequires:  %{rubygem fake_ftp:0.1.1 }
+BuildRequires:  %{rubygem fake_ftp:0.1 >= 0.1.1 }
 
 # Prevent have choice for rubygem(ruby:2.1.0:mime-types) >= 1.16
 BuildRequires:  %{rubygem mime-types >= 2}
@@ -132,11 +131,11 @@ BuildRequires:  ruby-macros >= 5
 #
 #
 #  s.add_dependency "bcrypt_pbkdf", "~> 1.0.0"
-Requires:       %{rubygem bcrypt_pbkdf:1.0.0 }
+Requires:       %{rubygem bcrypt_pbkdf:1.0 }
 #  s.add_dependency "childprocess", "~> 0.6.0"
 Requires:       %{rubygem childprocess:0.6}
 #   s.add_dependency "ed25519", "~> 1.2.4"
-Requires:       %{rubygem ed25519}
+Requires:       %{rubygem ed25519:1.2 >= 1.2.4}
 # Prevent have choice for rubygem(ruby:2.2.0:erubis)
 #  s.add_dependency "erubis", "~> 2.7.0"
 Requires:       %{rubygem erubis:2.7}