From 44dab0d823f4c21804a0e0a08b494b122838cdd59bafd216a8967e3cb38b3949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Thu, 18 Jan 2024 17:45:58 +0000 Subject: [PATCH 1/4] Accepting request 1139787 from home:13ilya:branches:Virtualization:vagrant - Added file ruby-dependency.patch for relaxed ruby requirement (boo#1218951). OBS-URL: https://build.opensuse.org/request/show/1139787 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=81 --- ruby-dependency.patch | 12 ++++++++++++ vagrant.changes | 5 +++++ vagrant.spec | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ruby-dependency.patch diff --git a/ruby-dependency.patch b/ruby-dependency.patch new file mode 100644 index 0000000..4c5a94b --- /dev/null +++ b/ruby-dependency.patch @@ -0,0 +1,12 @@ +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-18 19:38:47.090039506 +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.3" + s.required_rubygems_version = ">= 1.3.6" + + s.add_dependency "bcrypt_pbkdf", "~> 1.1" diff --git a/vagrant.changes b/vagrant.changes index 2d331d7..5324a13 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 18 17:01:43 UTC 2024 - Илья Индиго + +- Added file ruby-dependency.patch for relaxed ruby requirement (boo#1218951). + ------------------------------------------------------------------- Thu Dec 21 10:17:42 UTC 2023 - Илья Индиго diff --git a/vagrant.spec b/vagrant.spec index 700e9e0..3b5ae95 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -1,7 +1,7 @@ # # spec file for package vagrant # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2012 Laurent Bigonville , License GPL-2.0+ # # All modifications and additions to the file contributed by third parties @@ -47,6 +47,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-dependency.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 From c09de669f8d20b0fdedf21025742e8f4e98310e84a70384c6c7f27f597891a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Thu, 18 Jan 2024 23:44:23 +0000 Subject: [PATCH 2/4] Accepting request 1139826 from home:13ilya:branches:Virtualization:vagrant - Added file ruby-3.3.patch for ruby 3.3 support (boo#1218951). OBS-URL: https://build.opensuse.org/request/show/1139826 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=82 --- ruby-3.3.patch | 84 +++++++++++++++++++++++++++++++++++++++++++ ruby-dependency.patch | 12 ------- vagrant.changes | 4 +-- vagrant.spec | 2 +- 4 files changed, 87 insertions(+), 15 deletions(-) create mode 100644 ruby-3.3.patch delete mode 100644 ruby-dependency.patch diff --git a/ruby-3.3.patch b/ruby-3.3.patch new file mode 100644 index 0000000..68d2b58 --- /dev/null +++ b/ruby-3.3.patch @@ -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" diff --git a/ruby-dependency.patch b/ruby-dependency.patch deleted file mode 100644 index 4c5a94b..0000000 --- a/ruby-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-18 19:38:47.090039506 +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.3" - s.required_rubygems_version = ">= 1.3.6" - - s.add_dependency "bcrypt_pbkdf", "~> 1.1" diff --git a/vagrant.changes b/vagrant.changes index 5324a13..6f64625 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Thu Jan 18 17:01:43 UTC 2024 - Илья Индиго +Thu Jan 18 23:38:54 UTC 2024 - Илья Индиго -- Added file ruby-dependency.patch for relaxed ruby requirement (boo#1218951). +- Added file ruby-3.3.patch for ruby 3.3 support (boo#1218951). ------------------------------------------------------------------- Thu Dec 21 10:17:42 UTC 2023 - Илья Индиго diff --git a/vagrant.spec b/vagrant.spec index 3b5ae95..8328a32 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -47,7 +47,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-dependency.patch +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 From 437bcc453541ca68a3e89108d44c82264ed1fc5f54204c048637a1a09796895a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Fri, 19 Jan 2024 19:56:35 +0000 Subject: [PATCH 3/4] Accepting request 1140014 from home:13ilya:branches:Virtualization:vagrant - Added file ruby-3.3.patch for ruby 3.3 support (boo#1218951). OBS-URL: https://build.opensuse.org/request/show/1140014 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=83 --- vagrant.changes | 2 +- vagrant.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vagrant.changes b/vagrant.changes index 6f64625..72d3e68 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Jan 18 23:38:54 UTC 2024 - Илья Индиго +Fri Jan 19 19:52:43 UTC 2024 - Илья Индиго - Added file ruby-3.3.patch for ruby 3.3 support (boo#1218951). diff --git a/vagrant.spec b/vagrant.spec index 8328a32..7d06b79 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -80,7 +80,7 @@ Patch13: 0013-Bump-webrick-dependency-to-1.8.0.patch # Build dependencies #=============================================================================== -BuildRequires: %{ruby} >= 3.0 +BuildRequires: %{ruby} >= 3.0, %{ruby} < 3.4 BuildRequires: %{rubygem bundler} # s.add_dependency "bcrypt_pbkdf", "~> 1.1" BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 } From dad8febf9a274ef1d831ba093c6061133648112a350c88890bc31119d539080f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Mon, 22 Jan 2024 16:09:04 +0000 Subject: [PATCH 4/4] Accepting request 1140685 from home:13ilya:branches:Virtualization:vagrant - Added file ruby-3.3.patch for ruby 3.3 support (boo#1218951). OBS-URL: https://build.opensuse.org/request/show/1140685 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=84 --- vagrant.changes | 2 +- vagrant.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/vagrant.changes b/vagrant.changes index 72d3e68..9b3acf7 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Fri Jan 19 19:52:43 UTC 2024 - Илья Индиго +Mon Jan 22 16:04:58 UTC 2024 - Илья Индиго - Added file ruby-3.3.patch for ruby 3.3 support (boo#1218951). diff --git a/vagrant.spec b/vagrant.spec index 7d06b79..26432e0 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -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/ @@ -80,7 +84,7 @@ Patch13: 0013-Bump-webrick-dependency-to-1.8.0.patch # Build dependencies #=============================================================================== -BuildRequires: %{ruby} >= 3.0, %{ruby} < 3.4 +BuildRequires: %{ruby} < 3.4 BuildRequires: %{rubygem bundler} # s.add_dependency "bcrypt_pbkdf", "~> 1.1" BuildRequires: %{rubygem bcrypt_pbkdf:1 >= 1.1 }