#19 Update to Vagrant 2.2.5.
Closed 4 years ago by pvalena. Opened 4 years ago by pvalena.
rpms/ pvalena/vagrant rebase  into  master

file modified
+11 -10
@@ -6,7 +6,7 @@ 

  

  Name: vagrant

  Version: 2.2.5

- Release: 1%{?dist}

+ Release: 2%{?dist}

  Summary: Build and distribute virtualized development environments

  License: MIT

  URL: http://vagrantup.com
@@ -52,10 +52,8 @@ 

  Requires: curl

  

  Recommends: vagrant(vagrant-libvirt)

- Recommends: rubygem(bcrypt_pbkdf)

- Recommends: rubygem(ed25519)

- 

- Requires(pre): shadow-utils

+ Suggests: rubygem(bcrypt_pbkdf)

+ Suggests: rubygem(ed25519)

  

  BuildRequires: bsdtar

  BuildRequires: ruby
@@ -78,7 +76,7 @@ 

  BuildRequires: rubygem(webmock)

  BuildRequires: rubygem(fake_ftp)

  BuildRequires: pkgconfig(bash-completion)

- %if ! %{without help2man}

+ %if %{with help2man}

  BuildRequires: help2man

  %endif

  BuildRequires: %{_bindir}/ssh
@@ -194,7 +192,7 @@ 

  touch %{buildroot}%{vagrant_plugin_conf}

  ln -s -t %{buildroot}%{vagrant_embedded_dir}/ %{vagrant_plugin_conf}

  

- %if ! %{without help2man}

+ %if %{with help2man}

  # Turn `vagrant --help` into man page.

  export GEM_PATH="%{gem_dir}:%{buildroot}/usr/share/vagrant/gems"

  # Needed to display help page without a warning.
@@ -346,6 +344,9 @@ 

  %dir %{bashcompletion_dir}

  %{bashcompletion_dir}/%{name}

  %{_rpmconfigdir}/macros.d/macros.%{name}

+ %if %{with help2man}

+ %{_mandir}/man1/%{name}.1*

+ %endif

  

  %files doc

  %doc %{vagrant_plugin_instdir}/RELEASE.md
@@ -354,11 +355,11 @@ 

  %{vagrant_plugin_instdir}/Rakefile

  %{vagrant_plugin_instdir}/tasks

  %{vagrant_plugin_instdir}/vagrant-spec.config.example.rb

- %if ! %{without help2man}

- %{_mandir}/man1/%{name}.1*

- %endif

  

  %changelog

+ * Fri Aug 23 2019 Pavel Valena <pvalena@redhat.com> - 2.2.5-2

+ - Move man pages to main package

+ 

  * Wed Aug 14 2019 Pavel Valena <pvalena@redhat.com> - 2.2.5-1

  - Update to Vagrant 2.2.5.

  

To have newest Vagrant in Fedora.

I've disabled 1 docker test that requires actual configuring network device.


Copr build:
https://copr.fedorainfracloud.org/coprs/pvalena/vagrant/build/999647/

Koji scratch-build:
https://koji.fedoraproject.org/koji/taskinfo?taskID=37167664

Checks:

  • Smoke test: ok

Tested with:

  • vagrant-2.2.5-1.fc31.2.noarch
  • vagrant-libvirt-0.0.45-5.fc30.noarch
  • ruby-2.6.3-121.fc31.x86_64
  • rubygems-3.0.3-121.fc31.noarch
  • rubygem-net-ssh-5.1.0-2.fc31.noarch
  • rubygem-i18n-1.1.1-4.fc31.noarch
  • rubygem-childprocess-1.0.1-4.fc31.noarch
  • rubygem-ruby-libvirt-0.7.1-6.fc31.x86_64
  • rubygem-fog-core-2.1.2-3.fc31.noarch
  • rubygem-fog-json-1.2.0-3.fc31.noarch
  • rubygem-fog-libvirt-0.6.0-1.fc31.noarch

rebased onto a8e30ac

4 years ago

LGTM. Merged manually.

rebased onto f416dd1

4 years ago

Pull-Request has been closed by pvalena

4 years ago