From 3057b5eaa33434df2b29eb8ecde0da36c5f0efd8 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 22 Jan 2015 17:40:59 +0100 Subject: Rename the patch file to a better name. --- vagrant-libvirt-fix-dependencies.patch | 48 ++++++++++++++++++++++++++++ vagrant-libvirt-use-ruby-libvirt-0.5.x.patch | 48 ---------------------------- vagrant-libvirt.spec | 2 +- 3 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 vagrant-libvirt-fix-dependencies.patch delete mode 100644 vagrant-libvirt-use-ruby-libvirt-0.5.x.patch diff --git a/vagrant-libvirt-fix-dependencies.patch b/vagrant-libvirt-fix-dependencies.patch new file mode 100644 index 0000000..e7cdd77 --- /dev/null +++ b/vagrant-libvirt-fix-dependencies.patch @@ -0,0 +1,48 @@ +From f68ea1b437cf1d6c9609365257d501aada29a392 Mon Sep 17 00:00:00 2001 +From: Josef Stribny +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| + s.add_development_dependency(%q, ["= 2.12.2"]) + s.add_development_dependency(%q, ["= 2.12.1"]) + s.add_development_dependency(%q, ["= 2.12.1"]) +- s.add_runtime_dependency(%q, ["= 1.15"]) +- s.add_runtime_dependency(%q, ["= 0.4.0"]) ++ s.add_runtime_dependency(%q, [">= 1.23"]) ++ s.add_runtime_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) + s.add_runtime_dependency(%q, ["~> 1.6.0"]) + s.add_development_dependency(%q, ["= 10.1.0"]) + else + s.add_dependency(%q, ["= 2.12.2"]) + s.add_dependency(%q, ["= 2.12.1"]) + s.add_dependency(%q, ["= 2.12.1"]) +- s.add_dependency(%q, ["= 1.15"]) +- s.add_dependency(%q, ["= 0.4.0"]) ++ s.add_dependency(%q, [">= 1.23"]) ++ s.add_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) + s.add_dependency(%q, ["~> 1.6.0"]) + s.add_dependency(%q, ["= 10.1.0"]) + end +@@ -42,8 +42,8 @@ Gem::Specification.new do |s| + s.add_dependency(%q, ["= 2.12.2"]) + s.add_dependency(%q, ["= 2.12.1"]) + s.add_dependency(%q, ["= 2.12.1"]) +- s.add_dependency(%q, ["= 1.15"]) +- s.add_dependency(%q, ["= 0.4.0"]) ++ s.add_dependency(%q, [">= 1.23"]) ++ s.add_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) + s.add_dependency(%q, ["~> 1.6.0"]) + s.add_dependency(%q, ["= 10.1.0"]) + end +-- +1.9.3 + diff --git a/vagrant-libvirt-use-ruby-libvirt-0.5.x.patch b/vagrant-libvirt-use-ruby-libvirt-0.5.x.patch deleted file mode 100644 index e7cdd77..0000000 --- a/vagrant-libvirt-use-ruby-libvirt-0.5.x.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f68ea1b437cf1d6c9609365257d501aada29a392 Mon Sep 17 00:00:00 2001 -From: Josef Stribny -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| - s.add_development_dependency(%q, ["= 2.12.2"]) - s.add_development_dependency(%q, ["= 2.12.1"]) - s.add_development_dependency(%q, ["= 2.12.1"]) -- s.add_runtime_dependency(%q, ["= 1.15"]) -- s.add_runtime_dependency(%q, ["= 0.4.0"]) -+ s.add_runtime_dependency(%q, [">= 1.23"]) -+ s.add_runtime_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) - s.add_runtime_dependency(%q, ["~> 1.6.0"]) - s.add_development_dependency(%q, ["= 10.1.0"]) - else - s.add_dependency(%q, ["= 2.12.2"]) - s.add_dependency(%q, ["= 2.12.1"]) - s.add_dependency(%q, ["= 2.12.1"]) -- s.add_dependency(%q, ["= 1.15"]) -- s.add_dependency(%q, ["= 0.4.0"]) -+ s.add_dependency(%q, [">= 1.23"]) -+ s.add_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) - s.add_dependency(%q, ["~> 1.6.0"]) - s.add_dependency(%q, ["= 10.1.0"]) - end -@@ -42,8 +42,8 @@ Gem::Specification.new do |s| - s.add_dependency(%q, ["= 2.12.2"]) - s.add_dependency(%q, ["= 2.12.1"]) - s.add_dependency(%q, ["= 2.12.1"]) -- s.add_dependency(%q, ["= 1.15"]) -- s.add_dependency(%q, ["= 0.4.0"]) -+ s.add_dependency(%q, [">= 1.23"]) -+ s.add_dependency(%q, [">= 0.4.0"], ["< 0.6.0"]) - s.add_dependency(%q, ["~> 1.6.0"]) - s.add_dependency(%q, ["= 10.1.0"]) - end --- -1.9.3 - diff --git a/vagrant-libvirt.spec b/vagrant-libvirt.spec index 9d0fde1..15d593d 100644 --- a/vagrant-libvirt.spec +++ b/vagrant-libvirt.spec @@ -10,7 +10,7 @@ URL: https://github.com/pradels/vagrant-libvirt Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem Source1: 10-vagrant.rules # Use fog with ruby-libvirt 0.5.x -Patch0: vagrant-libvirt-use-ruby-libvirt-0.5.x.patch +Patch0: vagrant-libvirt-fix-dependencies.patch Requires(pre): shadow-utils Requires(posttrans): vagrant Requires(preun): vagrant -- cgit