[vagrant/f21] Fix dependencies for the f21 build.
Michael Adam
obnox at fedoraproject.org
Thu Feb 19 00:02:47 UTC 2015
commit 3c92da55e81fb4fce53c26f719012b2aa14a7064
Author: Michael Adam <madam at redhat.com>
Date: Thu Feb 19 00:56:46 2015 +0100
Fix dependencies for the f21 build.
vagrant-1.7.2-fix-dependencies.patch | 5 +++--
vagrant.spec | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/vagrant-1.7.2-fix-dependencies.patch b/vagrant-1.7.2-fix-dependencies.patch
index d77fb2f..75b8b40 100644
--- a/vagrant-1.7.2-fix-dependencies.patch
+++ b/vagrant-1.7.2-fix-dependencies.patch
@@ -35,15 +35,16 @@ index d2b9398..6158fb2 100644
+++ b/vagrant.gemspec
@@ -18,25 +18,30 @@ Gem::Specification.new do |s|
- s.add_dependency "bundler", ">= 1.5.2", "< 1.8.0"
+- s.add_dependency "childprocess", "~> 0.5.0"
+ s.add_dependency "bundler", ">= 1.5.2", "!= 1.7.0"
- s.add_dependency "childprocess", "~> 0.5.0"
++ s.add_dependency "childprocess", ">= 0.3.9"
s.add_dependency "erubis", "~> 2.7.0"
- s.add_dependency "i18n", "~> 0.6.0"
- s.add_dependency "listen", "~> 2.8.0"
+ s.add_dependency "i18n", ">= 0.6.0"
+ # https://github.com/mitchellh/vagrant/pull/4770
+ s.add_dependency "json"
-+ s.add_dependency "listen", "~> 2.7.1"
++ s.add_dependency "listen", ">= 0.4.7"
s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
diff --git a/vagrant.spec b/vagrant.spec
index 6841f20..6d73db5 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -215,6 +215,9 @@ getent group vagrant >/dev/null || groupadd -r vagrant
%changelog
+* Tue Feb 19 2015 Michael Adam <madam at redhat.com> - 1.7.2-1
+- Adapt Dependencies for Fedora 21.
+
* Thu Feb 12 2015 Tomas Hrcka <thrcka at redhat.com> - 1.7.2-1
- Update to latest upstream version 1.7.2
- Backport dependencies fix patch
More information about the scm-commits
mailing list