From a503b69672fe2100bbaed2f741a6272ad04cd981 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 24 Jan 2015 19:24:20 +0100 Subject: Adapt for fedora 21. --- vagrant-libvirt-fix-dependencies.patch | 6 +++--- vagrant-libvirt.spec | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/vagrant-libvirt-fix-dependencies.patch b/vagrant-libvirt-fix-dependencies.patch index b77c3d3..0fbe52c 100644 --- a/vagrant-libvirt-fix-dependencies.patch +++ b/vagrant-libvirt-fix-dependencies.patch @@ -8,7 +8,7 @@ index 83005c1..c513c6f 100644 s.add_development_dependency(%q, ["~> 2.12.1"]) - s.add_runtime_dependency(%q, ["~> 1.15"]) - s.add_runtime_dependency(%q, ["~> 0.4"]) -+ s.add_runtime_dependency(%q, [">= 1.23"]) ++ s.add_runtime_dependency(%q, [">= 1.22"]) + s.add_runtime_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) s.add_runtime_dependency(%q, ["~> 1.6.0"]) s.add_development_dependency(%q, [">= 0"]) @@ -18,7 +18,7 @@ index 83005c1..c513c6f 100644 s.add_dependency(%q, ["~> 2.12.1"]) - s.add_dependency(%q, ["~> 1.15"]) - s.add_dependency(%q, ["~> 0.4"]) -+ s.add_dependency(%q, [">= 1.23"]) ++ s.add_dependency(%q, [">= 1.22"]) + s.add_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) s.add_dependency(%q, ["~> 1.6.0"]) s.add_dependency(%q, [">= 0"]) @@ -29,7 +29,7 @@ index 83005c1..c513c6f 100644 s.add_dependency(%q, ["~> 2.12.1"]) - s.add_dependency(%q, ["~> 1.15"]) - s.add_dependency(%q, ["~> 0.4"]) -+ s.add_dependency(%q, [">= 1.23"]) ++ s.add_dependency(%q, [">= 1.22"]) + s.add_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) s.add_dependency(%q, ["~> 1.6.0"]) s.add_dependency(%q, [">= 0"]) diff --git a/vagrant-libvirt.spec b/vagrant-libvirt.spec index 7a0d60c..ae9884b 100644 --- a/vagrant-libvirt.spec +++ b/vagrant-libvirt.spec @@ -2,7 +2,7 @@ Name: %{vagrant_plugin_name} Version: 0.0.24 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Libvirt provider for vagrant Group: Development/Languages License: MIT @@ -17,7 +17,7 @@ Requires(posttrans): vagrant Requires(preun): vagrant Requires: ruby(release) Requires: ruby(rubygems) -Requires: rubygem(fog) => 1.23 +Requires: rubygem(fog) => 1.22 Requires: rubygem(fog) < 2 Requires: rubygem(ruby-libvirt) #Requires: rubygem(ruby-libvirt) => 0.5.0 @@ -75,7 +75,7 @@ pushd .%{vagrant_plugin_instdir} sed -i '/:git/ s|:git.*$|:path => "%{vagrant_dir}"|' Gemfile sed -i '/rspec/ s|\[\".*\"]|["~> 2.0"]|' vagrant-libvirt.gemspec -bundle exec rspec2 spec +bundle exec rspec spec popd %pre @@ -111,6 +111,9 @@ getent group vagrant >/dev/null || groupadd -r vagrant %changelog +* Fri Jan 23 2015 Michael Adam - 0.0.24-3 +- Adapt dependencies for fedora 21. + * Fri Jan 23 2015 Michael Adam - 0.0.24-2 - Fix minor review issues. - Move README.md to main package as doc. -- cgit