#3 Update to vagrant-libvirt 0.0.45.
Closed 6 months ago by vondruch. Opened 9 months ago by pvalena.
rpms/ pvalena/vagrant-libvirt rebase  into  master

file modified
+1 -1

@@ -1,2 +1,2 @@ 

- SHA512 (vagrant-libvirt-0.0.43.gem) = c24ea4c79c3a206a0896548e755aaafb20030d8cf2c04a289fb813f77efa394bb0df5bebb7dce70cdf69c1e5f1de651a92d823d9c62f252459fdf5a3de1e666f

+ SHA512 (vagrant-libvirt-0.0.45.gem) = 502f0d3576835ee9686c3605166410e15e68449c5cea1fbe6f88e70b945dcc45b92063d5b3678db289734de8ca4f7966cee25347a1c76b41e35bced9930d0016

  SHA512 (vagrant-spec-94a9d31ba18b4130b14da12a2f7b4001c3d2ff12.tar.gz) = b95eefa52c21e1020f3f889fc5a72476a3ffb76f780b0254af85bbbc55465c05081f7c18303caa67843bc959326cbf253b57609faa8187fd89188a2488bfe922

@@ -0,0 +1,23 @@ 

+ From a6d5d4df918b040a0a1906b26abf20fc3bab1690 Mon Sep 17 00:00:00 2001

+ From: Pavel Valena <pvalena@redhat.com>

+ Date: Wed, 6 Feb 2019 13:29:01 +0100

+ Subject: [PATCH] Enable QEMU Session by default

+ 

+ sets default for `@qemu_use_session` to true.

+ ---

+  lib/vagrant-libvirt/config.rb | 2 +-

+  1 file changed, 1 insertion(+), 1 deletion(-)

+ 

+ diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb

+ index 2aa1bce..1bc8411 100644

+ --- a/lib/vagrant-libvirt/config.rb

+ +++ b/lib/vagrant-libvirt/config.rb

+ @@ -651,7 +651,7 @@ def finalize!

+          @management_network_pci_slot = nil if @management_network_pci_slot == UNSET_VALUE

+          @system_uri      = 'qemu:///system' if @system_uri == UNSET_VALUE

+  

+ -        @qemu_use_session = false if @qemu_use_session == UNSET_VALUE

+ +        @qemu_use_session = true if @qemu_use_session == UNSET_VALUE

+  

+          # generate a URI if none is supplied

+          @uri = _generate_uri if @uri == UNSET_VALUE

file modified
+20 -7

@@ -3,8 +3,8 @@ 

  %global vagrant_spec_commit 94a9d31ba18b4130b14da12a2f7b4001c3d2ff12

  

  Name: %{vagrant_plugin_name}

- Version: 0.0.43

- Release: 2%{?dist}

+ Version: 0.0.45

+ Release: 1%{?dist}

  Summary: libvirt provider for Vagrant

  License: MIT

  URL: https://github.com/vagrant-libvirt/vagrant-libvirt

@@ -13,6 +13,9 @@ 

  # dependency, it should be fine to include the source right here.

  # 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

+ # Enable QEMU Session by default

+ # https://github.com/vagrant-libvirt/vagrant-libvirt/pull/969

+ Patch0: vagrant-libvirt-0.0.45-enable-qemu-session-by-default.patch

  

  Requires: ruby(release)

  Requires: ruby(rubygems)

@@ -47,6 +50,8 @@ 

  %prep

  %setup -q -n %{vagrant_plugin_name}-%{version} -b2

  

+ %patch0 -p1

+ 

  # Relax fog-core dependency to work with recently rebased one

  %gemspec_remove_dep -s ../%{vagrant_plugin_name}-%{version}.gemspec -g fog-core '~> 1.43.0'

  %gemspec_add_dep -s ../%{vagrant_plugin_name}-%{version}.gemspec -g fog-core '>= 1.43.0'

@@ -61,17 +66,20 @@ 

          %{buildroot}%{vagrant_plugin_dir}/

  

  %check

+ # Edit gemspec of vagrant-spec

+ pushd ../vagrant-spec-%{vagrant_spec_commit}

  # Remove the git reference, which is useless in our case.

- sed -i '/git/ s/^/#/' ../vagrant-spec-%{vagrant_spec_commit}/vagrant-spec.gemspec

+ sed -i '/git/ s/^/#/' vagrant-spec.gemspec

  

  # 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'

+ %gemspec_remove_dep -s vagrant-spec.gemspec -g childprocess '~> 0.6.0'

+ %gemspec_add_dep -s 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

+ sed -i '/thor/ s/~>/>=/' vagrant-spec.gemspec

+ sed -i '/rspec/ s/~>/>=/' vagrant-spec.gemspec

+ popd

  

  # Use actual gemspec for tests

  cp ../%{vagrant_plugin_name}-%{version}.gemspec .%{vagrant_plugin_instdir}/%{vagrant_plugin_name}.gemspec

@@ -79,6 +87,7 @@ 

  pushd .%{vagrant_plugin_instdir}

  # Create dummy Gemfile and load dependencies via gemspec file

  echo "gem 'vagrant'" > Gemfile

+ echo "gem 'rdoc'" >> Gemfile

  echo "gem 'vagrant-spec', :path => '%{_builddir}/vagrant-spec-%{vagrant_spec_commit}'" >> Gemfile

  echo "gemspec" >> Gemfile

  

@@ -111,6 +120,10 @@ 

  %{vagrant_plugin_instdir}/vagrant-libvirt.gemspec

  

  %changelog

+ * Wed Nov 28 2018 Pavel Valena <pvalena@redhat.com> - 0.0.45-1

+ - Update to vagrant-libvirt 0.0.45.

+ - Enable QEMU Session by default

+ 

  * Fri Nov 02 2018 Pavel Valena <pvalena@redhat.com> - 0.0.43-2

  - Relax fog-core dependency to work with recently rebased one.

  

Up-to-date Copr build:
https://copr.fedorainfracloud.org/coprs/build/855607/


DONE:


Checks:

  • Tests: ok
  • rpmlint: ok
  • Smoke test: ok

Smoke-test env:

I'd love to see the discussion about qemu://session somewhere on fedora-devel. Otherwise, there is not much to see here unless I am really going to test it (which I won't ATM ;) )

rebased onto b011fc1

7 months ago

rebased onto 8c2bea5

7 months ago

1 new commit added

  • Enable QEMU Session by default.
6 months ago

Pull-Request has been closed by vondruch

6 months ago

Merged manually due to conflicts.