From f5b1700a2d17ea0b8174e081279ac2218bd3e1f2 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 1 Jan 2017 21:55:44 +0900 Subject: [PATCH 1/2] Relax nokogiri dependency --- vagrant-libvirt.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/vagrant-libvirt.spec b/vagrant-libvirt.spec index 9810ccd..9ff40b0 100644 --- a/vagrant-libvirt.spec +++ b/vagrant-libvirt.spec @@ -2,7 +2,7 @@ Name: %{vagrant_plugin_name} Version: 0.0.32 -Release: 2%{?dist} +Release: 3%{?dist} Summary: libvirt provider for Vagrant Group: Development/Languages License: MIT @@ -16,8 +16,8 @@ Requires(preun): vagrant Requires: ruby(release) Requires: ruby(rubygems) Requires: rubygem(fog-libvirt) -Requires: rubygem(nokogiri) => 1.6.0 -Requires: rubygem(nokogiri) < 1.7 +Requires: rubygem(nokogiri) >= 1.6 +Requires: rubygem(nokogiri) < 2 Requires: rubygem(multi_json) Requires: polkit Requires: vagrant @@ -46,6 +46,9 @@ gem unpack %{SOURCE0} gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec +# Relax nokogiri dependency +sed -i '\@nokogiri@s|~> 1\.6\.0|~> 1.6|' %{vagrant_plugin_name}.gemspec + %build gem build %{vagrant_plugin_name}.gemspec %vagrant_plugin_install @@ -106,6 +109,9 @@ getent group vagrant >/dev/null || groupadd -r vagrant %changelog +* Sun Jan 1 2017 Mamoru TASAKA - 0.0.32-3 +- Relax nokogiri dependency + * Fri Feb 05 2016 Fedora Release Engineering - 0.0.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5efd0553b9efa593d84e982dffe3a05ecd816389 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 1 Jan 2017 22:05:54 +0900 Subject: [PATCH 2/2] add BR:rubygem(rdoc) --- vagrant-libvirt.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vagrant-libvirt.spec b/vagrant-libvirt.spec index 9ff40b0..091072e 100644 --- a/vagrant-libvirt.spec +++ b/vagrant-libvirt.spec @@ -24,6 +24,8 @@ Requires: vagrant BuildRequires: vagrant BuildRequires: rubygem(rspec) < 3 BuildRequires: rubygem(fog-libvirt) +# FIXME: RDoc is not installed: cannot load such file -- rdoc/rdoc +BuildRequires: rubygem(rdoc) BuildArch: noarch Provides: vagrant(%{vagrant_plugin_name}) = %{version}