PR#9: Update to Vagrant 2.1.2. - rpms/vagrant

rpms / vagrant

#9 Update to Vagrant 2.1.2.

Merged 5 years ago by pvalena. Opened 5 years ago by pvalena.

rpms/ pvalena/vagrant rebase into master

Add manpage generated using man2help.

Pavel Valena • 5 years ago

e00d21f

Update to Vagrant 2.1.2.

Pavel Valena • 5 years ago

81ee9f1

sources

file modified

+1 -1

		`@@ -1,2 +1,2 @@`
		`- SHA512 (vagrant-2.1.1.tar.gz) = 6cc82b4c33b196fce2bc460447afd152e53c3c17b45db5d80958ff631f6747c386b625ff26e3d8830a88b2feca82d550ad1de32e7c7607dffb25960af43092f5`
		`+ SHA512 (vagrant-2.1.2.tar.gz) = d9a2612697842885d23d1a9a452ef9d8b03defa4e6f7a808725ac7c3a87300affcfdd89ee3a42334259601e19f1e56bfd86a5aa7b404eac26bc22dcfd4a57751`
		`SHA512 (vagrant-spec-9413ab298407114528766efefd1fb1ff24589636.tar.gz) = 4dc502e75bb8795953c8c338892346431bbd3120239fa7a25175becf148c999293c264a6bb24c52c2821071303e2b20a8353b197370d595cf2e6bc00569cb631`

vagrant-2.1.2-fix-dependencies.patch ~~vagrant-2.1.1-fix-dependencies.patch~~

file renamed

+3 -7

		`@@ -4,14 +4,14 @@`
		`Subject: [PATCH] Fix dependencies for Vagrant 2.0.4.`

		`---`
		`- vagrant.gemspec \| 29 ++++++++++++++++-------------`
		`- 1 file changed, 16 insertions(+), 13 deletions(-)`
		`+ vagrant.gemspec \| 25 ++++++++++++++++-------------`
		`+ 1 file changed, 14 insertions(+), 11 deletions(-)`

		`diff --git a/vagrant.gemspec b/vagrant.gemspec`
		`index c92ca17..aeee52f 100644`
		`--- a/vagrant.gemspec`
		`+++ b/vagrant.gemspec`
		`- @@ -12,37 +12,40 @@ Gem::Specification.new do \|s\|`
		`+ @@ -12,35 +12,38 @@ Gem::Specification.new do \|s\|`
		`s.summary = "Build and distribute virtualized development environments."`
		`s.description = "Vagrant is a tool for building and distributing virtualized development environments."`

		`@@ -37,14 +37,10 @@`
		`+ # s.add_dependency "rb-kqueue", "~> 0.2.0"`
		`s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"`
		`- s.add_dependency "wdm", "~> 0.1.0"`
		`- - s.add_dependency "win32-file", "~> 0.8.1"`
		`- - s.add_dependency "win32-file-security", "~> 1.0.10"`
		`- s.add_dependency "winrm", "~> 2.1"`
		`- s.add_dependency "winrm-fs", "~> 1.0"`
		`- s.add_dependency "winrm-elevated", "~> 1.1"`
		`+ # s.add_dependency "wdm", "~> 0.1.0"`
		`- + # s.add_dependency "win32-file", "~> 0.8.1"`
		`- + # s.add_dependency "win32-file-security", "~> 1.0.10"`
		`+ # s.add_dependency "winrm", "~> 2.1"`
		`+ # s.add_dependency "winrm-fs", "~> 1.0"`
		`+ # s.add_dependency "winrm-elevated", "~> 1.1"`

vagrant.spec

file modified

+17 -4

		`@@ -3,8 +3,8 @@`
		`%global vagrant_spec_commit 9413ab298407114528766efefd1fb1ff24589636`

		`Name: vagrant`
		`- Version: 2.1.1`
		`- Release: 2%{?dist}`
		`+ Version: 2.1.2`
		`+ Release: 1%{?dist}`
		`Summary: Build and distribute virtualized development environments`
		`Group: Development/Languages`
		`License: MIT`
		`@@ -14,7 +14,7 @@`
		`Source1: binstub`
		`# The library has no official release yet. But since it is just test`
		`# dependency, it should be fine to include the source right here.`
		`- # wget https://github.com/mitchellh/vagrant-spec/archive/f3daedaac493ebc0ba1a96c915423a329e09e84a/vagrant-spec-f3daedaac493ebc0ba1a96c915423a329e09e84a.tar.gz`
		`+ # wget https://github.com/mitchellh/vagrant-spec/archive/9413ab298407114528766efefd1fb1ff24589636/vagrant-spec-9413ab298407114528766efefd1fb1ff24589636.tar.gz`
		`Source2: https://github.com/mitchellh/%{name}-spec/archive/%{vagrant_spec_commit}/%{name}-spec-%{vagrant_spec_commit}.tar.gz`
		`# Monkey-patching needed for Vagrant to work until the respective patches`
		`# for RubyGems and Bundler are in place`
		`@@ -24,7 +24,7 @@`
		`# fails on older Fedoras.`
		`%{?load:%{SOURCE4}}`

		`- Patch0: vagrant-2.1.1-fix-dependencies.patch`
		`+ Patch0: vagrant-2.1.2-fix-dependencies.patch`

		`Requires: ruby(release)`
		`Requires: ruby(rubygems) >= 1.3.6`
		`@@ -67,6 +67,7 @@`
		`BuildRequires: rubygem(webmock)`
		`BuildRequires: rubygem(fake_ftp)`
		`BuildRequires: pkgconfig(bash-completion)`
		`+ BuildRequires: help2man`
		`BuildRequires: %{_bindir}/ssh`
		`BuildArch: noarch`

		`@@ -156,6 +157,14 @@`
		`require 'vagrant/plugin/manager'`
		`EOF`

		+ # Turn `vagrant --help` into man page.
		`+ export GEM_PATH="%{gem_dir}:%{buildroot}/usr/share/vagrant/gems"`
		`+ # Needed to display help page without a warning.`
		`+ export VAGRANT_INSTALLER_ENV=1`
		`+ mkdir -p %{buildroot}%{_mandir}/man1`
		`+ help2man --no-discard-stderr -N -s1 -o %{buildroot}%{_mandir}/man1/%{name}.1 \`
		`+ %{buildroot}/usr/share/%{name}/gems/gems/%{name}-%{version}/bin/%{name}`
		`+`

		`%check`
		`# Adjust the vagrant-spec directory name.`
		`@@ -302,9 +311,13 @@`
		`%{vagrant_plugin_instdir}/Rakefile`
		`%{vagrant_plugin_instdir}/tasks`
		`%{vagrant_plugin_instdir}/vagrant-spec.config.example.rb`
		`+ %{_mandir}/man1/%{name}.1*`


		`%changelog`
		`+ * Wed Jul 18 2018 Pavel Valena <pvalena@redhat.com> - 2.1.2-1`
		`+ - Update to Vagrant 2.1.2.`
		`+`
		`* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org>`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild`

pvalena commented 5 years ago

Up-to-date scratch-build:
https://koji.fedoraproject.org/koji/taskinfo?taskID=28412309

Checks:

sources diff: ok
rpmlint: ok

Added manpage using help2man:

VAGRANT(1)                        User Commands                        VAGRANT(1)

NAME
       Vagrant - manual page for Vagrant 2.1.2

SYNOPSIS
       vagrant [options] <command> [<args>]

DESCRIPTION
       -v, --version
              Print the version and exit.

       -h, --help
              Print this help.

   Common commands:
       box    manages boxes: installation, removal, etc.

       destroy
              stops and deletes all traces of the vagrant machine

       global-status
              outputs status Vagrant environments for this user

       halt   stops the vagrant machine

       help   shows the help for a subcommand

       init   initializes a new Vagrant environment by creating a Vagrantfile

       login  log in to HashiCorp's Vagrant Cloud

       package
              packages a running vagrant environment into a box

       plugin manages plugins: install, uninstall, update, etc.

       port   displays information about guest port mappings

       powershell
              connects to machine via powershell remoting
[ . . . ]

rebased onto 73c24f4665e81df8d8065a2f82ec2465dc897aab

5 years ago

rebased onto 096d4ca53492e33083cac4fd5ad79407d8b98be2

5 years ago

2 new commits added