[packages/vagrant] up to 1.7.2
glen
glen at pld-linux.org
Sun Feb 1 20:53:57 CET 2015
commit 86f0f949f5d556c017aea17dca3bcae35c4149ed
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Feb 1 21:53:22 2015 +0200
up to 1.7.2
Vagrantfile.patch | 17 +++++++++++------
checkpoint.patch | 6 +++---
listen.patch | 19 +++++++++++++++++++
vagrant.spec | 10 ++++++----
4 files changed, 39 insertions(+), 13 deletions(-)
---
diff --git a/vagrant.spec b/vagrant.spec
index dc19d9e..dadfd18 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -2,13 +2,13 @@
# - release notes: https://github.com/mitchellh/vagrant/blob/master/CHANGELOG.md
Summary: Provisioning and deployment of virtual instances
Name: vagrant
-Version: 1.7.1
+Version: 1.7.2
# NOTE: test that it actually works before doing rel "1"
-Release: 0.10
+Release: 1
License: MIT
Group: Applications/Emulators
Source0: https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 6bfb1440145f943e7b683ac99d06adec
+# Source0-md5: 5fdb20727a3c3c31f33432ba7d5283a4
Source1: %{name}.sh
Patch0: source_root.patch
Patch1: rubygems.patch
@@ -18,6 +18,7 @@ Patch4: version.patch
Patch5: no-gems.patch
Patch6: checkpoint.patch
Patch7: insert-key.patch
+Patch8: listen.patch
URL: http://www.vagrantup.com/
BuildRequires: bash
BuildRequires: rpm-rubyprov
@@ -37,7 +38,7 @@ Requires: ruby-childprocess >= 0.5.0
Requires: ruby-erubis >= 2.7.0
Requires: ruby-i18n >= 0.6.0
Requires: ruby-json
-Requires: ruby-listen >= 2.7.1
+Requires: ruby-listen >= 2.7.11
Requires: ruby-log4r < 1.1.11
Requires: ruby-log4r >= 1.1.9
Requires: ruby-net-scp >= 1.1.0
@@ -124,6 +125,7 @@ Ruby documentation for %{gem_name}
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
VERSION=$(cat version.txt)
sed -i -e "s/__VERSION__/$VERSION/" lib/vagrant/version.rb
diff --git a/Vagrantfile.patch b/Vagrantfile.patch
index 7aec5ee..b95c81c 100644
--- a/Vagrantfile.patch
+++ b/Vagrantfile.patch
@@ -1,5 +1,5 @@
---- vagrant-1.7.1/templates/commands/init/Vagrantfile.erb 2014-12-16 23:38:23.939569458 +0200
-+++ vagrant-1.7.1/templates/commands/init/Vagrantfile.erb 2014-12-16 23:48:35.584550814 +0200
+--- vagrant-1.7.2/templates/commands/init/Vagrantfile.erb~ 2015-02-01 21:23:53.000000000 +0200
++++ vagrant-1.7.2/templates/commands/init/Vagrantfile.erb 2015-02-01 21:25:33.825801076 +0200
@@ -39,6 +39,10 @@
# your network.
# config.vm.network "public_network"
@@ -11,15 +11,20 @@
# Share an additional folder to the guest VM. The first argument is
# the path on the host to the actual folder. The second argument is
# the path on the guest to mount the folder. And the optional third
-@@ -72,5 +76,9 @@
+@@ -74,8 +74,16 @@
+ # Enable provisioning with a shell script. Additional provisioners such as
+ # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
# documentation for more information about their specific syntax and use.
-- # config.vm.provision "shell", inline <<-SHELL
-- # sudo apt-get install apache2
+ #
+ # http://docs.vagrantup.com/v2/provisioning/shell.html
+ #
+ # config.vm.provision "shell", inline: <<-SHELL
+ # sudo apt-get update
+ # sudo apt-get install -y apache2
+ # SHELL
++ #
+ # config.vm.provision "shell", inline: <<-SHELL
+ # poldek -u chef --noask
- # SHELL
++ # SHELL
+ #
end
diff --git a/checkpoint.patch b/checkpoint.patch
index d30ed86..d48e8b4 100644
--- a/checkpoint.patch
+++ b/checkpoint.patch
@@ -31,12 +31,12 @@ enable checkpoint only if VAGRANT_CHECKPOINT_ENABLE=1 is set
# If we disabled state and knowing what alerts we've seen, then
# disable the signature file.
signature_file = @data_dir.join("checkpoint_signature")
---- vagrant-1.7.1/vagrant.gemspec~ 2015-02-01 20:31:59.000000000 +0200
-+++ vagrant-1.7.1/vagrant.gemspec 2015-02-01 20:37:49.334191244 +0200
+--- vagrant-1.7.2/vagrant.gemspec~ 2015-02-01 21:26:08.000000000 +0200
++++ vagrant-1.7.2/vagrant.gemspec 2015-02-01 21:26:30.022042723 +0200
@@ -20,7 +20,6 @@
s.add_dependency "erubis", "~> 2.7.0"
s.add_dependency "i18n", "~> 0.6.0"
- s.add_dependency "listen", "~> 2.7.11"
+ s.add_dependency "listen", "~> 2.8.0"
- s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
diff --git a/listen.patch b/listen.patch
new file mode 100644
index 0000000..365aa35
--- /dev/null
+++ b/listen.patch
@@ -0,0 +1,19 @@
+no explanation why the bump:
+https://github.com/mitchellh/vagrant/commit/025736c2823b1c4147c67af8c874496b37effa57
+
+and listen 2.8 seems to have issues with sass:
+https://github.com/sass/sass/pull/1527
+
+see:
+https://github.com/guard/listen/releases/tag/v2.8.1
+--- vagrant-1.7.2/vagrant.gemspec~ 2015-02-01 21:29:55.000000000 +0200
++++ vagrant-1.7.2/vagrant.gemspec 2015-02-01 21:50:06.455356315 +0200
+@@ -19,7 +19,7 @@
+ s.add_dependency "childprocess", "~> 0.5.0"
+ s.add_dependency "erubis", "~> 2.7.0"
+ s.add_dependency "i18n", "~> 0.6.0"
+- s.add_dependency "listen", "~> 2.8.0"
++ s.add_dependency "listen", "~> 2.7.11"
+ s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
+ s.add_dependency "net-ssh", ">= 2.6.6", "< 2.10.0"
+ s.add_dependency "net-sftp", "~> 2.1"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vagrant.git/commitdiff/86f0f949f5d556c017aea17dca3bcae35c4149ed
More information about the pld-cvs-commit
mailing list