rpm/vagrant
SHA256
1
0
Fork 0
forked from pool/vagrant
Code Pull Requests Activity

Accepting request 1146277 from Virtualization:vagrant

Browse Source 
- add patch 0014-Bump-vagrant_cloud_dependency.patch to allow newer
  vagrant_cloud versions

To Staging:F with rubygem-vagrant_cloud

OBS-URL: https://build.opensuse.org/request/show/1146277
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=56
This commit is contained in:
Ana Guerrero 2024-02-15 19:59:44 +00:00 committed by Git OBS Bridge
commit 65ef208a48
3 changed files with 71 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0014-Bump-vagrant_cloud_dependency.patch Normal file
View File

@ -0,0 +1,26 @@
From 430bd45e3df6a42c2b8a45bf43036e17a210f74d Mon Sep 17 00:00:00 2001
From: Johannes Kastl <git@johannes-kastl.de>
Date: Mon, 12 Feb 2024 06:40:48 +0100
Subject: [PATCH] vagrant.gemspec: vagrant_cloud ~> 3.0
Signed-off-by: Johannes Kastl <git@johannes-kastl.de>
---
vagrant.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
index ef388b699..82280c1fe 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
s.add_dependency "rexml", "~> 3.2"
s.add_dependency "rgl", "~> 0.6.6"
s.add_dependency "rubyzip", "~> 2.3.2"
- s.add_dependency "vagrant_cloud", "~> 3.0.5"
+ s.add_dependency "vagrant_cloud", "~> 3.0"
s.add_dependency "winrm", ">= 2.3.6", "< 3.0"
s.add_dependency "winrm-elevated", ">= 1.2.3", "< 2.0"
s.add_dependency "winrm-fs", ">= 1.3.5", "< 2.0"
--
2.43.0

60
vagrant.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Feb 12 05:43:13 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
- add patch 0014-Bump-vagrant_cloud_dependency.patch to allow newer
vagrant_cloud versions
-------------------------------------------------------------------
Mon Jan 22 16:04:58 UTC 2024 - Илья Индиго <ilya@ilya.cf>
@ -42,11 +48,11 @@ Sun Jun 18 10:48:43 UTC 2023 - Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.c
- core: Update user error message on failed extension installs [GH-13207]
- core: Support loading legacy providers in OpenSSL 3 [GH-13178]
- provisioner/salt: Verify bootstrap-salt download [GH-13166]
BUG FIXES:
- communicator/ssh: Remove keyboard-interactive auth method [GH-13194]
- provisioner/salt: Fix usage on Windows guests [GH-13086]
VAGRANT-GO:
- Update data layer implementation [GH-12904]
- Update dependencies [GH-13201]
@ -1235,7 +1241,7 @@ Fri Oct 18 06:31:22 UTC 2019 - Johannes Kastl <kastl@b1-systems.de>
- update to 2.2.6
- dropped patch 0013-Only-return-interfaces-where-addr-is-not-nil.patch that has been included upstream
- set vagrant_cloud dependency to >= 2.0.3
FEATURES:
core/provisioners: Introduce new Provisioner options: before and after [GH-11043]
guest/alpine: Integrate the vagrant-alpine plugin into Vagrant core [GH-10975]
@ -1267,7 +1273,7 @@ Fri Oct 18 06:31:22 UTC 2019 - Johannes Kastl <kastl@b1-systems.de>
guest/suse: Update nfs & service daemon names for suse based hosts and guests [GH-11076]
provider/docker: Determine ip address prefix workaround for docker public networks [GH-11111]
provider/docker: Only return interfaces where addr is not nil for networks [GH-11116]
-------------------------------------------------------------------
Wed Aug 28 11:58:06 UTC 2019 - Dan Čermák <dcermak@suse.com>
@ -1441,7 +1447,7 @@ Mon Mar 4 14:43:17 UTC 2019 - Ana María Martínez Gómez <ammartinez@suse.com>
-------------------------------------------------------------------
Mon Jan 28 13:31:45 UTC 2019 - Dan Čermák <dcermak@suse.com>
- Update Requires and Buildrequires to match vagrant.gemspec
- Update Requires and Buildrequires to match vagrant.gemspec
-------------------------------------------------------------------
Fri Jan 11 15:29:14 UTC 2019 - Dan Čermák <dcermak@suse.com>
@ -1614,7 +1620,7 @@ Fri Nov 16 20:39:55 UTC 2018 - Johannes Kastl <kastl@b1-systems.de>
-------------------------------------------------------------------
Fri Nov 9 20:24:19 UTC 2018 - Johannes Kastl <kastl@b1-systems.de>
- 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
- 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 <kastl@b1-systems.de>
@ -1625,7 +1631,7 @@ Fri Nov 9 20:19:31 UTC 2018 - Johannes Kastl <kastl@b1-systems.de>
-------------------------------------------------------------------
Fri Nov 9 14:35:42 UTC 2018 - Johannes Kastl <kastl@b1-systems.de>
- use patch 0007-Support-system-installed-plugins.patch on tumbleweed only, as this seems to break Leap 15.0 systems
- 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
@ -1689,7 +1695,7 @@ Mon Jun 4 09:38:13 UTC 2018 - opensuse_buildservice@ojkastl.de
-------------------------------------------------------------------
Mon Jun 4 09:06:27 UTC 2018 - opensuse_buildservice@ojkastl.de
- added patch 0026-remove-dependency-on-win32-file.patch
- added patch 0026-remove-dependency-on-win32-file.patch
-------------------------------------------------------------------
Mon Jun 4 07:36:34 UTC 2018 - opensuse_buildservice@ojkastl.de
@ -1788,12 +1794,12 @@ Mon Jun 4 06:09:16 UTC 2018 - opensuse_buildservice@ojkastl.de
- hosts/windows: Convert to windows path if on WSL during vbox export [GH-9518]
- providers/virtualbox: Fix hostonly matching not respecting :name argument [GH-9302]
- util/credential_scrubber: Ignore empty strings [GH-9472, GH-9462]
-------------------------------------------------------------------
Mon Jun 4 06:03:31 UTC 2018 - opensuse_buildservice@ojkastl.de
- do no longer use /usr/share/vim/current for vagrant-vim, rather use the approach used by
package openSUSE:Leap:15.0/vim-plugins: %{_datadir}/vim/site/plugin/
package openSUSE:Leap:15.0/vim-plugins: %{_datadir}/vim/site/plugin/
-------------------------------------------------------------------
Sun May 13 19:54:25 UTC 2018 - opensuse_buildservice@ojkastl.de
@ -1819,7 +1825,7 @@ Thu Mar 1 21:34:53 UTC 2018 - opensuse_buildservice@ojkastl.de
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
- update to version 2.0.2
- update to version 2.0.2
-> removed patch 0001-Disable-Checkpoint.patch that has been upstreamed
-> removed patch 0031-allow-builds-with-ruby2.5.patch
@ -1869,7 +1875,7 @@ Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
- added patch 0031-allow-builds-with-ruby2.5.patch to allow building with ruby2.5
- added patch 0031-allow-builds-with-ruby2.5.patch to allow building with ruby2.5
-------------------------------------------------------------------
Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
@ -1980,12 +1986,12 @@ Wed Feb 28 06:31:45 UTC 2018 - opensuse_buildservice@ojkastl.de
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
the rubygem versions
-------------------------------------------------------------------
Sat Jan 27 20:58:00 UTC 2018 - robert.munteanu@gmail.com
- Explicitly build against ruby 2.5 for now
- Explicitly build against ruby 2.5 for now
-------------------------------------------------------------------
Thu Oct 26 19:42:46 UTC 2017 - tmkn@tmkn.uk
@ -1997,7 +2003,7 @@ Thu Oct 26 19:42:46 UTC 2017 - tmkn@tmkn.uk
Sun Oct 22 19:00:05 UTC 2017 - robert.munteanu@gmail.com
- Added upstream patch 0010-virtualbox-5.2-support.patch to allow
running with upcoming Virtualbox 5.2
running with upcoming Virtualbox 5.2
-------------------------------------------------------------------
Thu Sep 28 13:38:17 UTC 2017 - dimstar@opensuse.org
@ -2011,26 +2017,26 @@ Thu Sep 28 13:38:17 UTC 2017 - dimstar@opensuse.org
Tue Aug 29 12:33:50 UTC 2017 - robert.munteanu@gmail.com
- Added 0024-do-not-depend-on-wdm.patch - that rubygem only works
on windows
on windows
-------------------------------------------------------------------
Wed Aug 16 08:59:17 UTC 2017 - robert.munteanu@gmail.com
- Rebase 0023-vbox-fix-package.patch for Vagrant 1.9.7
- Fix various 'have choice for ...' errors
- Fix various 'have choice for ...' errors
-------------------------------------------------------------------
Sun Aug 13 19:07:06 UTC 2017 - robert.munteanu@gmail.com
- add 0023-vbox-fix-package.patch ( boo#1044087 )
- add 0023-vbox-fix-package.patch ( boo#1044087 )
-------------------------------------------------------------------
Tue Jul 25 18:17:14 UTC 2017 - opensuse_buildservice@ojkastl.de
- renamed patch 0010-also-build-with-ruby2.4.patch to
- renamed patch 0010-also-build-with-ruby2.4.patch to
0020-also-build-with-ruby2.4.patch
- add patches for ruby2.4 compatibility
* added patch
* added patch
0021-Use-Integer-instead-of-Fixnum-for-Ruby-2.4-compatibi.patch
* added patch 0022-Do-not-use-deprecated-API.patch
@ -2038,9 +2044,9 @@ Tue Jul 25 18:17:14 UTC 2017 - opensuse_buildservice@ojkastl.de
Mon Jul 24 19:51:52 UTC 2017 - opensuse_buildservice@ojkastl.de
- update to version 1.9.7
- removed patch 0005-Support-system-installed-plugins.patch that
- removed patch 0005-Support-system-installed-plugins.patch that
no longer applies
- added patch 0010-also-build-with-ruby2.4.patch that allows builds
- added patch 0010-also-build-with-ruby2.4.patch that allows builds
with ruby2.4, even if vagrant states otherwise
(https://github.com/mitchellh/vagrant/blob/master/vagrant.gemspec#L15)
@ -2048,23 +2054,23 @@ Mon Jul 24 19:51:52 UTC 2017 - opensuse_buildservice@ojkastl.de
Thu Jun 15 07:25:19 UTC 2017 - opensuse_buildservice@ojkastl.de
- as rubygem-childprocess has been updated to 0.7 in d:l:r:e, which
does not work with vagrant, a BuildRequires for
does not work with vagrant, a BuildRequires for
rubygem-childprocess <= 0.7 has been added
-------------------------------------------------------------------
Sun May 21 16:08:12 UTC 2017 - opensuse_buildservice@ojkastl.de
- update to version 1.9.5
- removed patch 0007-Update-command.rb.patch, that has been
- removed patch 0007-Update-command.rb.patch, that has been
integrated upstream
- rebased patches to allow patching version 1.9.5 instead of 1.9.1
- added explicit BuildRequires for rubygems needed to get vagrant
to build
- added explicit BuildRequires for rubygems needed to get vagrant
to build
-------------------------------------------------------------------
Tue Mar 7 20:08:08 UTC 2017 - robert.munteanu@gmail.com
- Fix build in factory - failed due to
- Fix build in factory - failed due to
"have choice for rubygem(ruby:2.2.0:nokogiri)"
-------------------------------------------------------------------

25
vagrant.spec
View File

@ -16,7 +16,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# disable tests if you want to just run a quick build
%{bcond_without tests}
%global rb_build_versions %rb_default_ruby
@ -27,7 +27,6 @@
%global mod_full_name %{mod_name}-%{version}
%global vim_data_dir %{_datadir}/vim/site/plugin/
Name: vagrant
Version: 2.3.7
Release: 0
@ -65,6 +64,7 @@ Patch10: 0010-Remove-dependency-on-grpc-tools.patch
Patch11: 0011-Remove-vagrant-ssl-extension.patch
Patch12: 0012-Bump-rgl-dependency-to-0.6.6.patch
Patch13: 0013-Bump-webrick-dependency-to-1.8.0.patch
Patch14: 0014-Bump-vagrant_cloud_dependency.patch
# force only one ruby version
# CAUTION: if you change this, then you *must* also change the sed calls which
@ -79,13 +79,12 @@ Patch13: 0013-Bump-webrick-dependency-to-1.8.0.patch
%global vagrant_plugin_name vagrant
#===============================================================================
# Build dependencies
#===============================================================================
BuildRequires: %{ruby} < 3.4
BuildRequires: %{rubygem bundler}
BuildRequires: %{ruby} < 3.4
# s.add_dependency "bcrypt_pbkdf", "~> 1.1"
BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 }
# s.add_dependency "childprocess", "~> 4.1.0"
@ -106,7 +105,7 @@ BuildRequires: %{rubygem listen:3 >= 3.6 }
BuildRequires: %{rubygem hashicorp-checkpoint:0.1 >= 0.1.5 }
# s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
BuildRequires: %{rubygem log4r:1.1 >= 1.1.9 }
BuildConflicts: %{rubygem log4r:1.1 >= 1.1.11 }
BuildConflicts: %{rubygem log4r:1.1 >= 1.1.11 }
# s.add_dependency "mime-types", "~> 3.3"
BuildRequires: %{rubygem mime-types:3 >= 3.3 }
# s.add_dependency "net-ftp", "~> 0.1"
@ -134,8 +133,9 @@ BuildRequires: %{rubygem winrm:2 >= 2.3.4 }
BuildRequires: %{rubygem winrm-fs:1 >= 1.3.4 }
# s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0"
BuildRequires: %{rubygem winrm-elevated:1 >= 1.2.1 }
# s.add_dependency "vagrant_cloud", "~> 3.0.5"
BuildRequires: %{rubygem vagrant_cloud:3.0 >= 3.0.5 }
# Patched in 0014-Bump-vagrant_cloud_dependency.patch
# s.add_dependency "vagrant_cloud", "~> 3.0"
BuildRequires: %{rubygem vagrant_cloud:3 >= 3.0.5 }
# PATCHED -> removed
# s.add_development_dependency "grpc-tools", "~> 1.41.1"
@ -170,10 +170,10 @@ BuildRequires: ruby-macros >= 5
# for the test
%if %{with tests}
BuildRequires: openssh
BuildRequires: curl
BuildRequires: bsdtar
BuildRequires: %{rubygem vagrant-spec}
BuildRequires: bsdtar
BuildRequires: curl
BuildRequires: openssh
%endif
BuildRequires: fdupes
@ -230,8 +230,9 @@ Requires: %{rubygem winrm:2 >= 2.3.4}
Requires: %{rubygem winrm-fs:1 >= 1.3.4}
# s.add_dependency "winrm-elevated", ">= 1.2.1", "< 2.0"
Requires: %{rubygem winrm-elevated:1 >= 1.2.1}
# Patched in 0014-Bump-vagrant_cloud_dependency.patch
# s.add_dependency "vagrant_cloud", "~> 3.0.5"
Requires: %{rubygem vagrant_cloud:3.0 >= 3.0.5}
Requires: %{rubygem vagrant_cloud:3 >= 3.0.5}
Requires: bsdtar
@ -368,7 +369,6 @@ mkdir -p %{buildroot}%{dirname:%{vagrant_plugin_cache}}
mkdir -p %{buildroot}%{dirname:%{vagrant_plugin_spec}}
mkdir -p %{buildroot}%{dirname:%{vagrant_plugin_docdir}}
# fix shebang in %%{vagrant_dir}/bin/%%{name}
sed -i 's|^\#\!/usr/bin/env.*|\#\!/usr/bin/ruby\.%{rb_ruby_suffix}|' \
%{buildroot}%{vagrant_dir}/bin/%{name}
@ -378,7 +378,6 @@ sed -i 's|^\#\!/usr/bin/env.*|\#\!/usr/bin/ruby\.%{rb_ruby_suffix}|' \
mv %{buildroot}%{vagrant_plugin_dir}/bin/%{name}.%{rb_ruby_suffix} \
%{buildroot}%{vagrant_plugin_dir}/bin/%{name}
# Garbage collection
rm -f %{buildroot}%{vagrant_dir}/test/vagrant-spec/boxes/.keep
rm -f %{buildroot}%{vagrant_dir}/bin/vagrant.orig