From 4d0dd681592a67283f25e2be2d4373c4fd32fe5f8a4cbd7cb95d1e99f68b7bb6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 30 Jan 2018 14:44:45 +0000 Subject: [PATCH] Accepting request 570871 from Virtualization OBS-URL: https://build.opensuse.org/request/show/570871 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=7 --- vagrant.changes | 11 +++++++++++ vagrant.spec | 7 +++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/vagrant.changes b/vagrant.changes index 9c8b913..3951e67 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jan 30 08:17:11 UTC 2018 - robert.munteanu@gmail.com + +- No longer hardcode the ruby version, it was enough to lock down + the rubygem versions + +------------------------------------------------------------------- +Sat Jan 27 20:58:00 UTC 2018 - robert.munteanu@gmail.com + +- Explicitly build against ruby 2.5 for now + ------------------------------------------------------------------- Thu Oct 26 19:42:46 UTC 2017 - tmkn@tmkn.uk diff --git a/vagrant.spec b/vagrant.spec index 7796ecf..ddd9f1c 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -1,7 +1,7 @@ # # spec file for package vagrant # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Laurent Bigonville , License GPL-2.0+ # # All modifications and additions to the file contributed by third parties @@ -55,7 +55,6 @@ Patch24: 0024-do-not-depend-on-wdm.patch Patch25: 0025-do-not-abuse-relative-paths-in-docker-plugin.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 # @@ -65,10 +64,10 @@ BuildRequires: %{rubygem childprocess <= 0.7 } BuildRequires: %{rubygem crack } # Prevent have choice for rubygem(ruby:2.2.0:erubis) BuildRequires: %{rubygem erubis >= 2.7} -BuildRequires: %{rubygem fake_ftp} +BuildRequires: %{rubygem fake_ftp < 0.3} BuildRequires: %{rubygem hashicorp-checkpoint} BuildRequires: %{rubygem i18n <= 0.8 } -BuildRequires: %{rubygem listen} +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}