From d2be1b17d7168b829047a0fe7270bf1163199264bdabbeb0ab444a31b67946ce 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, 5 Sep 2024 11:02:59 +0000 Subject: [PATCH] - Changed dependency.patch for rexml 3.3 support. OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=93 --- dependency.patch | 8 +++++--- vagrant.changes | 5 +++++ vagrant.spec | 8 ++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dependency.patch b/dependency.patch index 26b416c..f155a29 100644 --- a/dependency.patch +++ b/dependency.patch @@ -20,7 +20,7 @@ diff -Pdpru vagrant-2.3.7.orig/Rakefile vagrant-2.3.7/Rakefile # based on their role, which makes development and debugging easier 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-09-04 20:41:17.907561815 +0300 ++++ vagrant-2.3.7/vagrant.gemspec 2024-09-04 20:44:57.390556590 +0300 @@ -16,7 +16,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = ">= 1.3.6" @@ -30,11 +30,13 @@ diff -Pdpru vagrant-2.3.7.orig/vagrant.gemspec vagrant-2.3.7/vagrant.gemspec s.add_dependency "ed25519", "~> 1.3.0" s.add_dependency "erubi" s.add_dependency 'googleapis-common-protos-types', '~> 1.3' -@@ -32,28 +32,23 @@ Gem::Specification.new do |s| +@@ -31,29 +31,24 @@ Gem::Specification.new do |s| + s.add_dependency "net-sftp", "~> 4.0" s.add_dependency "net-scp", "~> 4.0" s.add_dependency "rb-kqueue", "~> 0.2.0" - s.add_dependency "rexml", "~> 3.2" +- s.add_dependency "rexml", "~> 3.2" - s.add_dependency "rgl", "~> 0.5.10" ++ s.add_dependency "rexml", "~> 3.3" + s.add_dependency "rgl", "~> 0.6" s.add_dependency "rubyzip", "~> 2.3.2" - s.add_dependency "vagrant_cloud", "~> 3.0.5" diff --git a/vagrant.changes b/vagrant.changes index 3ee00c1..08bdc8b 100644 --- a/vagrant.changes +++ b/vagrant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 5 11:01:38 UTC 2024 - Илья Индиго + +- Changed dependency.patch for rexml 3.3 support. + ------------------------------------------------------------------- Wed Sep 4 17:41:58 UTC 2024 - Илья Индиго diff --git a/vagrant.spec b/vagrant.spec index 5477ef1..85cfd04 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -113,8 +113,8 @@ BuildRequires: %{rubygem net-sftp:4 } BuildRequires: %{rubygem net-scp:4 } # s.add_dependency "rb-kqueue", "~> 0.2.0" BuildRequires: %{rubygem rb-kqueue:0.2 } -# s.add_dependency "rexml", "~> 3.2" -BuildRequires: %{rubygem rexml:3 >= 3.2 } +# s.add_dependency "rexml", "~> 3.3" +BuildRequires: %{rubygem rexml:3 >= 3.3 } # PATCHED # s.add_dependency "rgl", "~> 0.6.6" BuildRequires: %{rubygem rgl:0.6 >= 0.6.6} @@ -210,8 +210,8 @@ Requires: %{rubygem net-sftp:4 } Requires: %{rubygem net-scp:4 } # s.add_dependency "rb-kqueue", "~> 0.2.0" Requires: %{rubygem rb-kqueue:0.2} -# s.add_dependency "rexml", "~> 3.2" -Requires: %{rubygem rexml:3 >= 3.2 } +# s.add_dependency "rexml", "~> 3.3" +Requires: %{rubygem rexml:3 >= 3.3 } # PATCHED # s.add_dependency "rgl", "~> 0.6.6" Requires: %{rubygem rgl:0.6 >= 0.6.6}