forked from pool/vagrant
Accepting request 854847 from home:dancermak:branches:Virtualization:vagrant
Patch rake version to ~> 13.0 OBS-URL: https://build.opensuse.org/request/show/854847 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=50
This commit is contained in:
parent
7496fc3f7b
commit
b3a8d8db37
@ -1,7 +1,7 @@
|
||||
From 3559bd65aa796772e31abbeb4bd92e0829ed5e99 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Terceiro <terceiro@debian.org>
|
||||
Date: Sat, 11 Oct 2014 16:54:58 -0300
|
||||
Subject: [PATCH 1/9] bin/vagrant: silence warning about installer
|
||||
Subject: [PATCH 01/10] bin/vagrant: silence warning about installer
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b2c6ef61dc339eae73640c357e6be6e1f8cf723a Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Terceiro <terceiro@debian.org>
|
||||
Date: Wed, 22 Oct 2014 09:40:14 -0200
|
||||
Subject: [PATCH 2/9] Use a private temporary dir
|
||||
Subject: [PATCH 02/10] Use a private temporary dir
|
||||
|
||||
Without this vagrant will clutter $TMPDIR with dozens of even hundreds
|
||||
of temporary files (~4 per vagrant invocation).
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 402f323f982ea36af2db24ac62ec527ff6530515 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Kastl <kastl@b1-systems.de>
|
||||
Date: Wed, 17 May 2017 09:09:57 +0200
|
||||
Subject: [PATCH 3/9] plugins-don-t-abuse-require_relative.patch
|
||||
Subject: [PATCH 03/10] plugins-don-t-abuse-require_relative.patch
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
|
@ -1,7 +1,7 @@
|
||||
From cb36ee51bb914627bda93641135721ee88b640a4 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Kastl <kastl@b1-systems.de>
|
||||
Date: Fri, 16 Nov 2018 21:12:43 +0100
|
||||
Subject: [PATCH 4/9] fix vbox package boo#1044087, added by
|
||||
Subject: [PATCH 04/10] 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 <kastl@b1-systems.de>
|
||||
|
@ -1,7 +1,7 @@
|
||||
From b65df008243ff8016b0e5714da53b5fb221e5961 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 5/9] do not depend on wdm
|
||||
Subject: [PATCH 05/10] do not depend on wdm
|
||||
|
||||
Signed-off-by: Johannes Kastl <kastl@b1-systems.de>
|
||||
---
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 4f32f38bb823405a3e3fcd54ebf878ad7c2ff78d Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Kastl <kastl@b1-systems.de>
|
||||
Date: Fri, 16 Nov 2018 21:14:46 +0100
|
||||
Subject: [PATCH 6/9] do not abuse relative paths in docker plugin to make
|
||||
Subject: [PATCH 06/10] 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 <kastl@b1-systems.de>
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 555f29e1367c56ad4aa17447a5108a7f3be1b91d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
||||
Date: Fri, 11 Jan 2019 12:32:28 +0100
|
||||
Subject: [PATCH 7/9] Don't abuse relative paths in plugins
|
||||
Subject: [PATCH 07/10] Don't abuse relative paths in plugins
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 5f9ae130821abc783b793fc222c471cebadf1891 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
||||
Date: Mon, 1 Apr 2019 17:28:31 +0200
|
||||
Subject: [PATCH 8/9] Skip failing tests
|
||||
Subject: [PATCH 08/10] Skip failing tests
|
||||
|
||||
---
|
||||
test/unit/bin/vagrant_test.rb | 4 ++--
|
||||
|
@ -1,7 +1,7 @@
|
||||
From 5e3f0edc8a1bc1db2355c424684a3fcd7f654e19 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
||||
Date: Wed, 28 Aug 2019 13:39:58 +0200
|
||||
Subject: [PATCH 9/9] Disable Subprocess unit test
|
||||
Subject: [PATCH 09/10] Disable Subprocess unit test
|
||||
|
||||
This unit test is *very* flaky on OBS' workers and causes random build
|
||||
failures. These are probably caused by worker being under high load and then
|
||||
|
26
0010-Update-rake-to-13.0.patch
Normal file
26
0010-Update-rake-to-13.0.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From 25b740d34eac7a430f248711ac6b97caadeecac1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
||||
Date: Fri, 4 Dec 2020 14:54:50 +0100
|
||||
Subject: [PATCH 10/10] Update rake to ~> 13.0
|
||||
|
||||
(cherry picked from commit 1916f69425f8a0f86e3d7249a25a116c5cf2a771)
|
||||
---
|
||||
vagrant.gemspec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vagrant.gemspec b/vagrant.gemspec
|
||||
index 6a586fd7c..3030a63e6 100644
|
||||
--- a/vagrant.gemspec
|
||||
+++ b/vagrant.gemspec
|
||||
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
|
||||
|
||||
# Constraint rake to properly handle deprecated method usage
|
||||
# from within rspec
|
||||
- s.add_development_dependency "rake", "~> 12.3.3"
|
||||
+ s.add_development_dependency "rake", "~> 13.0"
|
||||
s.add_development_dependency "rspec", "~> 3.5.0"
|
||||
s.add_development_dependency "rspec-its", "~> 1.3.0"
|
||||
s.add_development_dependency "webmock", "~> 2.3.1"
|
||||
--
|
||||
2.29.2
|
||||
|
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 11 10:01:47 UTC 2020 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
- Patch rake version to ~> 13.0
|
||||
|
||||
Add patch:
|
||||
* 0010-Update-rake-to-13.0.patch
|
||||
|
||||
Rebase patches:
|
||||
* 0001-bin-vagrant-silence-warning-about-installer.patch
|
||||
* 0002-Use-a-private-temporary-dir.patch
|
||||
* 0003-plugins-don-t-abuse-require_relative.patch.patch
|
||||
* 0004-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
|
||||
* 0005-do-not-depend-on-wdm.patch
|
||||
* 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
|
||||
* 0007-Don-t-abuse-relative-paths-in-plugins.patch
|
||||
* 0008-Skip-failing-tests.patch
|
||||
* 0009-Disable-Subprocess-unit-test.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 3 20:13:55 UTC 2020 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
|
@ -57,6 +57,8 @@ Patch6: 0006-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
|
||||
Patch7: 0007-Don-t-abuse-relative-paths-in-plugins.patch
|
||||
Patch8: 0008-Skip-failing-tests.patch
|
||||
Patch9: 0009-Disable-Subprocess-unit-test.patch
|
||||
# https://github.com/hashicorp/vagrant/pull/12097
|
||||
Patch10: 0010-Update-rake-to-13.0.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -126,8 +128,9 @@ BuildRequires: %{rubygem winrm-elevated:1 >= 1.2.1 }
|
||||
BuildRequires: %{rubygem vagrant_cloud:3.0 >= 3.0.2 }
|
||||
|
||||
# devel dependencies:
|
||||
# s.add_development_dependency "rake", "~> 12.3.3"
|
||||
BuildRequires: %{rubygem rake:12.3 >= 12.3.3 }
|
||||
# PATCHED
|
||||
# s.add_development_dependency "rake", "~> 13.0"
|
||||
BuildRequires: %{rubygem rake:13 }
|
||||
# s.add_development_dependency "rspec", "~> 3.5.0"
|
||||
BuildRequires: %{rubygem rspec:3.5 }
|
||||
# s.add_development_dependency "rspec-its", "~> 1.3.0"
|
||||
|
Loading…
Reference in New Issue
Block a user