diff --git a/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch b/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch deleted file mode 100644 index c181831..0000000 --- a/vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 27440fdd8cebf57882e3672376d409b139cc1e86 Mon Sep 17 00:00:00 2001 -From: Jarek Prokop -Date: Thu, 16 Jan 2025 13:36:05 +0100 -Subject: [PATCH] Fix the default vagrant URL for pulling boxes. - ---- - lib/vagrant/shared_helpers.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/vagrant/shared_helpers.rb b/lib/vagrant/shared_helpers.rb -index b07c89a48..3c57cad6d 100644 ---- a/lib/vagrant/shared_helpers.rb -+++ b/lib/vagrant/shared_helpers.rb -@@ -10,7 +10,7 @@ module Vagrant - # of Vagrant that may require remote access. - # - # @return [String] -- DEFAULT_SERVER_URL = "https://vagrantcloud.com".freeze -+ DEFAULT_SERVER_URL = "https://vagrantcloud.com/api/v2/vagrant".freeze - - # Max number of seconds to wait for joining an active thread. - # diff --git a/vagrant.spec b/vagrant.spec index 224083e..60cc94b 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -7,7 +7,7 @@ Name: vagrant Version: 2.3.4 -Release: 9%{?dist} +Release: 3%{?dist} Summary: Build and distribute virtualized development environments License: MIT URL: http://vagrantup.com @@ -40,10 +40,6 @@ Patch4: vagrant-2.3.4-Only-check-for-arguments-matching-test-string.patch # The file is removed as it requires protobuf components not yet # packaged in Fedora. Patch5: vagrant-2.3.4-Disable-loading-of-direct_conversions-file.patch -# Default URL for pulling boxes seems to have changed. -# This fix allows vagrant to pull boxes again. -# See: https://bugzilla.redhat.com/show_bug.cgi?id=2337302 -Patch6: vagrant-2.3.4-Fix-the-default-vagrant-URL-for-pulling-boxes.patch # The load directive is supported since RPM 4.12, i.e. F21+. The build process # fails on older Fedoras. @@ -63,6 +59,7 @@ Requires: rubygem(log4r) >= 1.1.9 Requires: (rubygem(net-ssh) >= 5.2.0 with rubygem(net-ssh) < 8) Requires: rubygem(net-scp) >= 1.2.0 Requires: rubygem(net-sftp) >= 2.1 +Requires: rubygem(rest-client) >= 1.6.0 Requires: rubygem(rubyzip) >= 1.1.7 Requires: rubygem(net-ftp) Requires: rubygem(rexml) @@ -99,6 +96,7 @@ BuildRequires: rubygem(erubi) BuildRequires: rubygem(rspec) BuildRequires: rubygem(rspec-its) BuildRequires: rubygem(net-sftp) +BuildRequires: rubygem(rest-client) BuildRequires: rubygem(rubyzip) BuildRequires: rubygem(thor) BuildRequires: rubygem(webmock) @@ -158,8 +156,6 @@ sed -i -e '/required_ruby_version/ s/, "< 3.2"//' %{name}.gemspec # We have newer version in Fedora %gemspec_remove_dep -s %{name}.gemspec -g listen %gemspec_add_dep -s %{name}.gemspec -g listen '>= 3.5.1' -%gemspec_remove_dep -s %{name}.gemspec -g rubyzip '~> 2.0' -%gemspec_add_dep -s %{name}.gemspec -g rubyzip '>= 2.0.0' # Remove Windows specific dependencies %gemspec_remove_dep -s %{name}.gemspec -g wdm @@ -203,7 +199,7 @@ sed -i '/^ require .net\/ssh\/authentication\/ed25519.$/,/^ end$/ s/^/#/' \ %endif # Let's get rid of protobuf related components -%patch 2 -p16 +%patch2 -p16 %gemspec_remove_file -s %{name}.gemspec Dir.glob('lib/vagrant/protobufs/**/*.*') # This file contains monkey patching and compatibility for Protobuf serialization. @@ -211,11 +207,9 @@ sed -i '/^ require .net\/ssh\/authentication\/ed25519.$/,/^ end$/ s/^/#/' \ %gemspec_remove_file -s %{name}.gemspec "plugins/commands/serve/util/direct_conversions.rb" rm -rf plugins/commands/serve/util/direct_conversions.rb # Patch out related requires in code. -%patch 5 -p1 +%patch5 -p1 -%patch 3 -p1 - -%patch 6 -p1 +%patch3 -p1 %build @@ -496,25 +490,6 @@ end %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb %changelog -* Mon Dec 22 2025 Vít Ondruch - 2.3.4-9 -- Relax `rubygem(rubyzip)` dependency - -* Fri Jul 25 2025 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Jarek Prokop - 2.3.4-7 -- Fix default URL used for pulling boxes. - Resolves: rhbz#2337302 - -* Sat Jul 20 2024 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Feb 07 2024 Vít Ondruch - 2.3.4-5 -- Drop superfluous rest-client dependency. - -* Sat Jan 27 2024 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Sat Jul 22 2023 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild