diff --git a/.gitignore b/.gitignore index b774019..a708826 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,2 @@ -/vagrant-libvirt-0.0.24.gem -/vagrant-libvirt-0.0.25.gem -/vagrant-libvirt-0.0.26.gem -/vagrant-libvirt-0.0.30.gem -/vagrant-libvirt-0.0.31.gem -/vagrant-libvirt-0.0.32.gem -/vagrant-libvirt-0.0.33.gem -/vagrant-spec-9bba7e1228379c0a249a06ce76ba8ea7d276afbe.tar.gz -/vagrant-libvirt-0.0.35.gem -/vagrant-libvirt-0.0.36.gem -/vagrant-libvirt-0.0.37.gem -/vagrant-libvirt-0.0.40.gem +/vagrant-spec-*.tar.gz +/vagrant-libvirt-*.gem diff --git a/sources b/sources index 3260dbb..a445597 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (vagrant-libvirt-0.0.40.gem) = 9d99ca8ce694d22cea44d7302353a8df69b6e9a27fd5bb8a717836ea99e1e6227b9fe8cfcfc894d6731c3deaa4ef61f94c2f608d6f7ad42f65554cb17d7193db -SHA512 (vagrant-spec-9bba7e1228379c0a249a06ce76ba8ea7d276afbe.tar.gz) = eda90b5e05c04c7c690bf4579931a0aa2a418ca6f3f1f9b0c18770e4d09fcea2f081f817604ed73c84cb33c437674e315b0ecbdfa7dc24ca94713bb179cb3544 +SHA512 (vagrant-libvirt-0.0.43.gem) = c24ea4c79c3a206a0896548e755aaafb20030d8cf2c04a289fb813f77efa394bb0df5bebb7dce70cdf69c1e5f1de651a92d823d9c62f252459fdf5a3de1e666f +SHA512 (vagrant-spec-94a9d31ba18b4130b14da12a2f7b4001c3d2ff12.tar.gz) = b95eefa52c21e1020f3f889fc5a72476a3ffb76f780b0254af85bbbc55465c05081f7c18303caa67843bc959326cbf253b57609faa8187fd89188a2488bfe922 diff --git a/vagrant-libvirt-0.40.0-Fix-failing-domain-tests-due-to-missing-property.patch b/vagrant-libvirt-0.40.0-Fix-failing-domain-tests-due-to-missing-property.patch deleted file mode 100644 index fa4af16..0000000 --- a/vagrant-libvirt-0.40.0-Fix-failing-domain-tests-due-to-missing-property.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fcaed64df995cd1b65e00f773e6d4e20101c48d4 Mon Sep 17 00:00:00 2001 -From: Darragh Bailey -Date: Mon, 29 May 2017 14:01:11 +0100 -Subject: [PATCH] Fix failing domain tests due to missing property - -Changes in names of data being passed through from the config object to -the CreateDomain action means that to test the domain xml template, -need to add an additional variable of qargs when testing. ---- - spec/unit/templates/domain_spec.rb | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/spec/unit/templates/domain_spec.rb b/spec/unit/templates/domain_spec.rb -index 9e1fca6..a96cba9 100644 ---- a/spec/unit/templates/domain_spec.rb -+++ b/spec/unit/templates/domain_spec.rb -@@ -8,6 +8,11 @@ - - class DomainTemplateHelper < VagrantPlugins::ProviderLibvirt::Config - include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate -+ -+ def finalize! -+ super -+ @qargs = @qemu_args -+ end - end - - let(:domain) { DomainTemplateHelper.new } diff --git a/vagrant-libvirt-0.40.0-Fix-invalid-xml-custom-domain-name-tests.patch b/vagrant-libvirt-0.40.0-Fix-invalid-xml-custom-domain-name-tests.patch deleted file mode 100644 index 113ac88..0000000 --- a/vagrant-libvirt-0.40.0-Fix-invalid-xml-custom-domain-name-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bef59efe6b8ba0bef824fcec460a1d34c546c2c3 Mon Sep 17 00:00:00 2001 -From: Andreas Bleischwitz -Date: Tue, 28 Nov 2017 18:23:47 +0100 -Subject: [PATCH] added spicevmc channel to domain_all_settings.xml and - domain_spec.rb - ---- - spec/unit/templates/domain_all_settings.xml | 9 ++++++--- - spec/unit/templates/domain_spec.rb | 3 +++ - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/spec/unit/templates/domain_all_settings.xml b/spec/unit/templates/domain_all_settings.xml -index 761e3a8..cdd8ac7 100644 ---- a/spec/unit/templates/domain_all_settings.xml -+++ b/spec/unit/templates/domain_all_settings.xml -@@ -62,14 +62,17 @@ - - - -- - - -+ -+ -+ - -- - -Date: Tue, 28 Nov 2017 18:22:40 +0100 -Subject: [PATCH] made ... and it's sub-elements conditional - ---- - lib/vagrant-libvirt/templates/domain.xml.erb | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/lib/vagrant-libvirt/templates/domain.xml.erb b/lib/vagrant-libvirt/templates/domain.xml.erb -index 7fd991e..74b483c 100644 ---- a/lib/vagrant-libvirt/templates/domain.xml.erb -+++ b/lib/vagrant-libvirt/templates/domain.xml.erb -@@ -112,11 +112,16 @@ - - <% @channels.each do |channel| %> - -- -+ -+ mode='<%= channel[:source_mode] %>' -+ <% end %> - <% if channel[:source_path] %> - path="<%= channel[:source_path] %>" - <% end %> - /> -+ <% end %> - - name="<%= channel[:target_name] %>" diff --git a/vagrant-libvirt.spec b/vagrant-libvirt.spec index 09c4b1b..bc8cb1a 100644 --- a/vagrant-libvirt.spec +++ b/vagrant-libvirt.spec @@ -1,10 +1,10 @@ %global vagrant_plugin_name vagrant-libvirt -%global vagrant_spec_commit 9bba7e1228379c0a249a06ce76ba8ea7d276afbe +%global vagrant_spec_commit 94a9d31ba18b4130b14da12a2f7b4001c3d2ff12 Name: %{vagrant_plugin_name} -Version: 0.0.40 -Release: 5%{?dist} +Version: 0.0.43 +Release: 1%{?dist} Summary: libvirt provider for Vagrant License: MIT URL: https://github.com/vagrant-libvirt/vagrant-libvirt @@ -14,21 +14,10 @@ Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem # wget https://github.com/mitchellh/vagrant-spec/archive/9bba7e1228379c0a249a06ce76ba8ea7d276afb/vagrant-spec-f1a18fd3e5387328ca83e016e48373aadb67112a.tar.gz Source2: https://github.com/mitchellh/vagrant-spec/archive/%{vagrant_spec_commit}/vagrant-spec-%{vagrant_spec_commit}.tar.gz -# Fix failing domain tests. -# https://github.com/vagrant-libvirt/vagrant-libvirt/pull/783 -Patch0: vagrant-libvirt-0.40.0-Fix-failing-domain-tests-due-to-missing-property.patch - -# Fix invalid XML creation on custom domain name. -# https://bugzilla.redhat.com/show_bug.cgi?id=1518899 -# https://github.com/vagrant-libvirt/vagrant-libvirt/issues/831 -Patch1: vagrant-libvirt-0.40.0-Fix-invalid-xml-custom-domain-name.patch -Patch2: vagrant-libvirt-0.40.0-Fix-invalid-xml-custom-domain-name-tests.patch - Requires: ruby(release) Requires: ruby(rubygems) Requires: rubygem(fog-libvirt) >= 0.3.0 Requires: rubygem(nokogiri) >= 1.6 -Requires: rubygem(nokogiri) < 2 # Vagrant changed packaging scriptlets in version 1.9.1. Requires: vagrant >= 1.9.1 # Required by "vagrant package" command (rhbz#1292217). @@ -36,9 +25,10 @@ Recommends: %{_bindir}/virt-sysprep BuildRequires: vagrant >= 1.9.1 BuildRequires: rubygem(bundler) BuildRequires: rubygem(rdoc) -BuildRequires: rubygem(rspec) < 3 +BuildRequires: rubygem(rspec) BuildRequires: rubygem(fog-libvirt) BuildRequires: rubygem(thor) +BuildRequires: rubygems-devel BuildArch: noarch Provides: vagrant(%{vagrant_plugin_name}) = %{version} @@ -55,21 +45,10 @@ BuildArch: noarch Documentation for %{name}. %prep -gem unpack %{SOURCE0} - -%setup -q -D -T -n %{vagrant_plugin_name}-%{version} -b2 - -gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec - -%patch0 -p1 -%patch1 -p1 - -# Relax nokogiri dependency -sed -i '\@nokogiri@s|~> 1\.6\.0|~> 1.6|' \ - %{vagrant_plugin_name}.gemspec +%setup -q -n %{vagrant_plugin_name}-%{version} -b2 %build -gem build %{vagrant_plugin_name}.gemspec +gem build ../%{vagrant_plugin_name}-%{version}.gemspec %vagrant_plugin_install %install @@ -81,26 +60,31 @@ cp -a .%{vagrant_plugin_dir}/* \ # Remove the git reference, which is useless in our case. sed -i '/git/ s/^/#/' ../vagrant-spec-%{vagrant_spec_commit}/vagrant-spec.gemspec -# Relax the thor dependency, since Fedora ships with newer version. +# Relax the Childprocess dependency, since Fedora currently ships with different version +# https://src.fedoraproject.org/rpms/rubygem-childprocess/pull-request/1 +%gemspec_remove_dep -s ../vagrant-spec-%{vagrant_spec_commit}/vagrant-spec.gemspec -g childprocess '~> 0.6.0' +%gemspec_add_dep -s ../vagrant-spec-%{vagrant_spec_commit}/vagrant-spec.gemspec -g childprocess '>= 0.5.0' + +# Relax the dependencies, since Fedora ships with newer versions. sed -i '/thor/ s/~>/>=/' ../vagrant-spec-%{vagrant_spec_commit}/vagrant-spec.gemspec +sed -i '/rspec/ s/~>/>=/' ../vagrant-spec-%{vagrant_spec_commit}/vagrant-spec.gemspec +# Use actual gemspec for tests +cp ../%{vagrant_plugin_name}-%{version}.gemspec .%{vagrant_plugin_instdir}/%{vagrant_plugin_name}.gemspec pushd .%{vagrant_plugin_instdir} -# Fix compatibility with latest Bundler. -# https://github.com/bundler/bundler/issues/5263 -sed -i '/gem.*vagrant-libvirt/ s/^/#/' Gemfile - -sed -i "s|, :git => '.*'$||" Gemfile -sed -i "s|:github => '.*',$|:path => '%{_builddir}/vagrant-spec-%{vagrant_spec_commit}',|" Gemfile -sed -i '/pry/ s/^/#/' Gemfile +# Create dummy Gemfile and load dependencies via gemspec file +echo "gem 'vagrant'" > Gemfile +echo "gem 'vagrant-spec', :path => '%{_builddir}/vagrant-spec-%{vagrant_spec_commit}'" >> Gemfile +echo "gemspec" >> Gemfile # We don't care about code coverage. -sed -i '/coveralls/ s/^/#/' Gemfile sed -i '/[cC]overalls/ s/^/#/' spec/spec_helper.rb -cat %{PATCH2} | patch -p1 -F 0 +# Relax developement rspec dependency +sed -i '/rspec/ s/~>/>=/' %{vagrant_plugin_name}.gemspec -GEM_PATH=%{vagrant_plugin_dir}:`ruby -e "print Gem.path.join(':')"` bundle exec rspec2 spec +GEM_PATH=%{vagrant_plugin_dir}:`ruby -e "print Gem.path.join(':')"` bundle exec rspec spec popd %files @@ -116,7 +100,6 @@ popd %files doc %doc %{vagrant_plugin_docdir} %doc %{vagrant_plugin_instdir}/example_box -%doc %{vagrant_plugin_instdir}/CHANGELOG.md %{vagrant_plugin_instdir}/Gemfile %doc %{vagrant_plugin_instdir}/README.md %{vagrant_plugin_instdir}/Rakefile @@ -124,6 +107,9 @@ popd %{vagrant_plugin_instdir}/vagrant-libvirt.gemspec %changelog +* Mon Oct 01 2018 pvalena - 0.0.43-1 +- Update to vagrant-libvirt 0.0.43. + * Sat Jul 14 2018 Fedora Release Engineering - 0.0.40-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild