Accepting request 1140686 from Virtualization:vagrant
- Added file ruby-3.3.patch for ruby 3.3 support (boo#1218951). OBS-URL: https://build.opensuse.org/request/show/1140686 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vagrant?expand=0&rev=55
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
cf8b7bd02a
84
ruby-3.3.patch
Normal file
84
ruby-3.3.patch
Normal file
@ -0,0 +1,84 @@
|
||||
diff -Pdpru vagrant-2.3.7.orig/.github/workflows/go-spectest-skipped.yml vagrant-2.3.7/.github/workflows/go-spectest-skipped.yml
|
||||
--- vagrant-2.3.7.orig/.github/workflows/go-spectest-skipped.yml 2023-06-15 23:40:35.000000000 +0300
|
||||
+++ vagrant-2.3.7/.github/workflows/go-spectest-skipped.yml 2024-01-19 02:27:59.974880099 +0300
|
||||
@@ -15,7 +15,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
- ruby: ['3.0', '3.1', '3.2']
|
||||
+ ruby: ['3.0', '3.1', '3.2', '3.3']
|
||||
name: Vagrant acceptance tests (Ruby ${{ matrix.ruby }})
|
||||
steps:
|
||||
- name: Stubbed for skip
|
||||
diff -Pdpru vagrant-2.3.7.orig/.github/workflows/go-spectest.yml vagrant-2.3.7/.github/workflows/go-spectest.yml
|
||||
--- vagrant-2.3.7.orig/.github/workflows/go-spectest.yml 2023-06-15 23:40:35.000000000 +0300
|
||||
+++ vagrant-2.3.7/.github/workflows/go-spectest.yml 2024-01-19 02:28:23.911891525 +0300
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
- ruby: ['3.0', '3.1', '3.2']
|
||||
+ ruby: ['3.0', '3.1', '3.2', '3.3']
|
||||
name: Vagrant acceptance tests (Ruby ${{ matrix.ruby }})
|
||||
steps:
|
||||
- name: Code Checkout
|
||||
diff -Pdpru vagrant-2.3.7.orig/.github/workflows/go-testing-skipped.yml vagrant-2.3.7/.github/workflows/go-testing-skipped.yml
|
||||
--- vagrant-2.3.7.orig/.github/workflows/go-testing-skipped.yml 2023-06-15 23:40:35.000000000 +0300
|
||||
+++ vagrant-2.3.7/.github/workflows/go-testing-skipped.yml 2024-01-19 02:28:43.102167235 +0300
|
||||
@@ -14,7 +14,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
- ruby: ['3.0', '3.1', '3.2']
|
||||
+ ruby: ['3.0', '3.1', '3.2', '3.3']
|
||||
name: Vagrant unit tests on Go (Ruby ${{ matrix.ruby }})
|
||||
steps:
|
||||
- name: Stubbed for skip
|
||||
diff -Pdpru vagrant-2.3.7.orig/.github/workflows/go-testing.yml vagrant-2.3.7/.github/workflows/go-testing.yml
|
||||
--- vagrant-2.3.7.orig/.github/workflows/go-testing.yml 2023-06-15 23:40:35.000000000 +0300
|
||||
+++ vagrant-2.3.7/.github/workflows/go-testing.yml 2024-01-19 02:29:05.385820685 +0300
|
||||
@@ -26,7 +26,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
- ruby: ['3.0', '3.1', '3.2']
|
||||
+ ruby: ['3.0', '3.1', '3.2', '3.3']
|
||||
name: Vagrant unit tests on Go (Ruby ${{ matrix.ruby }})
|
||||
steps:
|
||||
- name: Code Checkout
|
||||
diff -Pdpru vagrant-2.3.7.orig/.github/workflows/testing-skipped.yml vagrant-2.3.7/.github/workflows/testing-skipped.yml
|
||||
--- vagrant-2.3.7.orig/.github/workflows/testing-skipped.yml 2023-06-15 23:40:35.000000000 +0300
|
||||
+++ vagrant-2.3.7/.github/workflows/testing-skipped.yml 2024-01-19 02:31:50.474858960 +0300
|
||||
@@ -19,7 +19,7 @@ jobs:
|
||||
continue-on-error: true
|
||||
strategy:
|
||||
matrix:
|
||||
- ruby: [ '3.0', '3.1', '3.2' ]
|
||||
+ ruby: [ '3.0', '3.1', '3.2', '3.3' ]
|
||||
name: Vagrant unit tests on Ruby ${{ matrix.ruby }}
|
||||
steps:
|
||||
- name: Stubbed for skip
|
||||
diff -Pdpru vagrant-2.3.7.orig/.github/workflows/testing.yml vagrant-2.3.7/.github/workflows/testing.yml
|
||||
--- vagrant-2.3.7.orig/.github/workflows/testing.yml 2023-06-15 23:40:35.000000000 +0300
|
||||
+++ vagrant-2.3.7/.github/workflows/testing.yml 2024-01-19 02:32:17.978587414 +0300
|
||||
@@ -32,7 +32,7 @@ jobs:
|
||||
continue-on-error: true
|
||||
strategy:
|
||||
matrix:
|
||||
- ruby: [ '3.0', '3.1', '3.2' ]
|
||||
+ ruby: [ '3.0', '3.1', '3.2', '3.3' ]
|
||||
name: Vagrant unit tests on Ruby ${{ matrix.ruby }}
|
||||
steps:
|
||||
- name: Code Checkout
|
||||
diff -Pdpru vagrant-2.3.7.orig/vagrant.gemspec vagrant-2.3.7/vagrant.gemspec
|
||||
--- vagrant-2.3.7.orig/vagrant.gemspec 2023-06-15 23:40:35.000000000 +0300
|
||||
+++ vagrant-2.3.7/vagrant.gemspec 2024-01-19 02:33:37.299726955 +0300
|
||||
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
||||
s.summary = "Build and distribute virtualized development environments."
|
||||
s.description = "Vagrant is a tool for building and distributing virtualized development environments."
|
||||
|
||||
- s.required_ruby_version = ">= 3.0", "< 3.3"
|
||||
+ s.required_ruby_version = ">= 3.0", "< 3.4"
|
||||
s.required_rubygems_version = ">= 1.3.6"
|
||||
|
||||
s.add_dependency "bcrypt_pbkdf", "~> 1.1"
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 22 16:04:58 UTC 2024 - Илья Индиго <ilya@ilya.cf>
|
||||
|
||||
- Added file ruby-3.3.patch for ruby 3.3 support (boo#1218951).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 21 10:17:42 UTC 2023 - Илья Индиго <ilya@ilya.cf>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package vagrant
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2012 Laurent Bigonville <bigon@debian.org>, License GPL-2.0+
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -19,6 +19,10 @@
|
||||
# disable tests if you want to just run a quick build
|
||||
%{bcond_without tests}
|
||||
|
||||
%global rb_build_versions %rb_default_ruby
|
||||
%global rb_build_abi %rb_default_ruby_abi
|
||||
%global rb_ruby_suffix %rb_default_ruby_suffix
|
||||
#
|
||||
%global mod_name vagrant
|
||||
%global mod_full_name %{mod_name}-%{version}
|
||||
%global vim_data_dir %{_datadir}/vim/site/plugin/
|
||||
@ -47,6 +51,7 @@ Recommends: vagrant-libvirt
|
||||
# https://github.com/dcermak/vagrant.git repository.
|
||||
# On every new release of vagrant, rebase them on top of the latest tag.
|
||||
#
|
||||
Patch0: ruby-3.3.patch
|
||||
Patch1: 0001-bin-vagrant-silence-warning-about-installer.patch
|
||||
Patch2: 0002-Use-a-private-temporary-dir.patch
|
||||
Patch3: 0003-plugins-don-t-abuse-require_relative.patch.patch
|
||||
@ -79,7 +84,7 @@ Patch13: 0013-Bump-webrick-dependency-to-1.8.0.patch
|
||||
# Build dependencies
|
||||
#===============================================================================
|
||||
|
||||
BuildRequires: %{ruby} >= 3.0
|
||||
BuildRequires: %{ruby} < 3.4
|
||||
BuildRequires: %{rubygem bundler}
|
||||
# s.add_dependency "bcrypt_pbkdf", "~> 1.1"
|
||||
BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user