summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <madam@redhat.com>2015-01-22 17:44:05 +0100
committerMichael Adam <obnox@samba.org>2015-01-22 17:44:23 +0100
commit5431ed8324cc6fec3ce65d2dbf5437a36dbb358b (patch)
tree824ff9731996aeeab3096b1e3c5fd0cba7469317
parent093371a11445a77c2bcc1f570d941858ece8c1a3 (diff)
downloadfedora-vagrant-libvirt-5431ed8324cc6fec3ce65d2dbf5437a36dbb358b.tar.gz
fedora-vagrant-libvirt-5431ed8324cc6fec3ce65d2dbf5437a36dbb358b.tar.xz
fedora-vagrant-libvirt-5431ed8324cc6fec3ce65d2dbf5437a36dbb358b.zip
Fix the rake dependency to work on recent fedora rawhide.
-rw-r--r--vagrant-libvirt-fix-dependencies.patch24
1 files changed, 10 insertions, 14 deletions
diff --git a/vagrant-libvirt-fix-dependencies.patch b/vagrant-libvirt-fix-dependencies.patch
index e7cdd77..4184489 100644
--- a/vagrant-libvirt-fix-dependencies.patch
+++ b/vagrant-libvirt-fix-dependencies.patch
@@ -1,17 +1,8 @@
-From f68ea1b437cf1d6c9609365257d501aada29a392 Mon Sep 17 00:00:00 2001
-From: Josef Stribny <jstribny@redhat.com>
-Date: Tue, 14 Oct 2014 10:08:39 +0200
-Subject: [PATCH] Use ruby-libvirt 0.5.x
-
----
- vagrant-libvirt.gemspec | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
diff --git a/vagrant-libvirt.gemspec b/vagrant-libvirt.gemspec
index 83005c1..c513c6f 100644
--- a/vagrant-libvirt.gemspec
+++ b/vagrant-libvirt.gemspec
-@@ -25,16 +25,16 @@ Gem::Specification.new do |s|
+@@ -25,27 +25,27 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<rspec-core>, ["= 2.12.2"])
s.add_development_dependency(%q<rspec-expectations>, ["= 2.12.1"])
s.add_development_dependency(%q<rspec-mocks>, ["= 2.12.1"])
@@ -20,7 +11,8 @@ index 83005c1..c513c6f 100644
+ s.add_runtime_dependency(%q<fog>, [">= 1.23"])
+ s.add_runtime_dependency(%q<ruby-libvirt>, [">= 0.4.0"], ["< 0.6.0"])
s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6.0"])
- s.add_development_dependency(%q<rake>, ["= 10.1.0"])
+- s.add_development_dependency(%q<rake>, ["= 10.1.0"])
++ s.add_development_dependency(%q<rake>, [">= 10.1.0"])
else
s.add_dependency(%q<rspec-core>, ["= 2.12.2"])
s.add_dependency(%q<rspec-expectations>, ["= 2.12.1"])
@@ -30,9 +22,10 @@ index 83005c1..c513c6f 100644
+ s.add_dependency(%q<fog>, [">= 1.23"])
+ s.add_dependency(%q<ruby-libvirt>, [">= 0.4.0"], ["< 0.6.0"])
s.add_dependency(%q<nokogiri>, ["~> 1.6.0"])
- s.add_dependency(%q<rake>, ["= 10.1.0"])
+- s.add_dependency(%q<rake>, ["= 10.1.0"])
++ s.add_dependency(%q<rake>, [">= 10.1.0"])
end
-@@ -42,8 +42,8 @@ Gem::Specification.new do |s|
+ else
s.add_dependency(%q<rspec-core>, ["= 2.12.2"])
s.add_dependency(%q<rspec-expectations>, ["= 2.12.1"])
s.add_dependency(%q<rspec-mocks>, ["= 2.12.1"])
@@ -41,8 +34,11 @@ index 83005c1..c513c6f 100644
+ s.add_dependency(%q<fog>, [">= 1.23"])
+ s.add_dependency(%q<ruby-libvirt>, [">= 0.4.0"], ["< 0.6.0"])
s.add_dependency(%q<nokogiri>, ["~> 1.6.0"])
- s.add_dependency(%q<rake>, ["= 10.1.0"])
+- s.add_dependency(%q<rake>, ["= 10.1.0"])
++ s.add_dependency(%q<rake>, [">= 10.1.0"])
end
+ end
+
--
1.9.3