[packages/vagrant] - merge existing patches and fix various nonsenical deps - rel 3

baggins baggins at pld-linux.org
Sun Jul 15 10:54:57 CEST 2018 

commit bd9c408978599cde3acaceefbcc5c8e10f0dadf1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jul 15 10:54:11 2018 +0200

    - merge existing patches and fix various nonsenical deps
    - rel 3

 fix-deps.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 listen.patch   |  6 +++---
 net-ssh.patch  | 11 -----------
 no-gems.patch  | 15 ---------------
 vagrant.spec   |  6 ++----
 5 files changed, 49 insertions(+), 33 deletions(-)
---
diff --git a/vagrant.spec b/vagrant.spec
index 4e6a160..fed3858 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -3,7 +3,7 @@
 Summary:	Provisioning and deployment of virtual instances
 Name:		vagrant
 Version:	2.1.2
-Release:	2
+Release:	3
 License:	MIT
 Group:		Applications/Emulators
 Source0:	https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -13,11 +13,10 @@ Patch1:		rubygems.patch
 Patch2:		no-warning.patch
 Patch3:		Vagrantfile.patch
 Patch4:		version.patch
-Patch5:		no-gems.patch
+Patch5:		fix-deps.patch
 Patch7:		insert-key.patch
 Patch8:		listen.patch
 Patch9:		pld-chef-installed.patch
-Patch10:	net-ssh.patch
 URL:		http://www.vagrantup.com/
 BuildRequires:	bash
 BuildRequires:	rpm-rubyprov
@@ -115,7 +114,6 @@ Ruby documentation for %{gem_name}
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 VERSION=$(cat version.txt)
 sed -i -e "s/__VERSION__/$VERSION/" lib/vagrant/version.rb
diff --git a/fix-deps.patch b/fix-deps.patch
new file mode 100644
index 0000000..109d1d9
--- /dev/null
+++ b/fix-deps.patch
@@ -0,0 +1,44 @@
+--- vagrant-2.1.2/vagrant.gemspec.orig	2018-07-15 10:49:07.168725801 +0200
++++ vagrant-2.1.2/vagrant.gemspec	2018-07-15 10:52:05.604607306 +0200
+@@ -12,35 +12,24 @@
+   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     = "~> 2.2", "< 2.6"
++  s.required_ruby_version     = "~> 2.2"
+   s.required_rubygems_version = ">= 1.3.6"
+   s.rubyforge_project         = "vagrant"
+ 
+-  s.add_dependency "childprocess", "~> 0.6.0"
++  s.add_dependency "childprocess", ">= 0.6.0"
+   s.add_dependency "erubis", "~> 2.7.0"
+-  s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
++  s.add_dependency "i18n", ">= 0.6.0"
+   s.add_dependency "listen", "~> 3.1.5"
+   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
+   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
+-  s.add_dependency "net-ssh", "~> 4.2.0"
++  s.add_dependency "net-ssh", ">= 4.2.0"
+   s.add_dependency "net-sftp", "~> 2.1"
+-  s.add_dependency "net-scp", "~> 1.2.0"
+-  s.add_dependency "rb-kqueue", "~> 0.2.0"
++  s.add_dependency "net-scp", ">= 1.2.0"
+   s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
+-  s.add_dependency "wdm", "~> 0.1.0"
+-  s.add_dependency "winrm", "~> 2.1"
+-  s.add_dependency "winrm-fs", "~> 1.0"
+-  s.add_dependency "winrm-elevated", "~> 1.1"
+-
+-  # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions
+-  # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5).
+-  # Explicit constraint is defined to provide required dependency to listen without imposing
+-  # tighter restrictions on valid ruby versions
+-  s.add_dependency "ruby_dep", "<= 1.3.1"
+ 
+   # Constraint rake to properly handle deprecated method usage
+   # from within rspec
+-  s.add_development_dependency "rake", "~> 12.0.0"
++  s.add_development_dependency "rake", ">= 12.0.0"
+   s.add_development_dependency "rspec", "~> 3.5.0"
+   s.add_development_dependency "rspec-its", "~> 1.2.0"
+   s.add_development_dependency "webmock", "~> 2.3.1"
diff --git a/listen.patch b/listen.patch
index f9374ef..ec0ecff 100644
--- a/listen.patch
+++ b/listen.patch
@@ -9,11 +9,11 @@ https://github.com/guard/listen/releases/tag/v2.8.1
 --- vagrant-1.7.3/vagrant.gemspec~	2015-08-19 15:50:06.000000000 +0300
 +++ vagrant-1.7.3/vagrant.gemspec	2015-08-19 15:50:29.068750880 +0300
 @@ -19,7 +19,7 @@
-   s.add_dependency "childprocess", "~> 0.6.0"
+   s.add_dependency "childprocess", ">= 0.6.0"
    s.add_dependency "erubis", "~> 2.7.0"
-   s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
+   s.add_dependency "i18n", ">= 0.6.0"
 -  s.add_dependency "listen", "~> 3.1.5"
 +  s.add_dependency "listen", "~> 2.7.11"
    s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
    s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
-   s.add_dependency "net-ssh", "~> 4.2.0"
+   s.add_dependency "net-ssh", ">= 4.2.0"
diff --git a/net-ssh.patch b/net-ssh.patch
deleted file mode 100644
index 7f588f5..0000000
--- a/net-ssh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vagrant-2.1.2/vagrant.gemspec~	2018-07-15 10:36:09.000000000 +0200
-+++ vagrant-2.1.2/vagrant.gemspec	2018-07-15 10:41:18.155322829 +0200
-@@ -22,7 +22,7 @@
-   s.add_dependency "listen", "~> 2.7.11"
-   s.add_dependency "hashicorp-checkpoint", "~> 0.1.5"
-   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
--  s.add_dependency "net-ssh", "~> 4.2.0"
-+  s.add_dependency "net-ssh", ">= 4.2.0"
-   s.add_dependency "net-sftp", "~> 2.1"
-   s.add_dependency "net-scp", "~> 1.2.0"
-   s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
diff --git a/no-gems.patch b/no-gems.patch
deleted file mode 100644
index 7c8bd20..0000000
--- a/no-gems.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vagrant-1.7.3/vagrant.gemspec	2015-08-19 15:49:13.811643302 +0300
-+++ vagrant-1.7.4/vagrant.gemspec	2015-08-19 16:56:50.654693192 +0300
-@@ -25,12 +25,7 @@
-   s.add_dependency "net-ssh", "~> 4.2.0"
-   s.add_dependency "net-sftp", "~> 2.1"
-   s.add_dependency "net-scp", "~> 1.2.0"
--  s.add_dependency "rb-kqueue", "~> 0.2.0"
-   s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
--  s.add_dependency "wdm", "~> 0.1.0"
--  s.add_dependency "winrm", "~> 2.1"
--  s.add_dependency "winrm-fs", "~> 1.0"
--  s.add_dependency "winrm-elevated", "~> 1.1"
- 
-   # NOTE: The ruby_dep gem is an implicit dependency from the listen gem. Later versions
-   # of the ruby_dep gem impose an aggressive constraint on the required ruby version (>= 2.2.5).
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vagrant.git/commitdiff/bd9c408978599cde3acaceefbcc5c8e10f0dadf1

More information about the pld-cvs-commit mailing list