[vagrant] Update to 1.7.2
Tomáš Hrčka
humaton at fedoraproject.org
Wed Feb 18 14:10:07 UTC 2015
commit 7ed4ada8c1f224d7c97ea8676773fda072d78075
Author: Tomas Hrcka <thrcka at redhat.com>
Date: Thu Feb 12 15:27:01 2015 +0100
Update to 1.7.2
.gitignore | 1 +
sources | 2 +-
vagrant.spec | 22 +++++++++++++++-------
3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 130c1eb..64f653e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/vagrant-1.6.5.tar.gz
/vagrant-spec-c0dafc996165bf1628b672dd533f1858ff66fe4a.tar.gz
+/vagrant-1.7.2.tar.gz
diff --git a/sources b/sources
index 785e79b..2b72fc7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-0c7aa7c0262a1822a1c0e0f349984a97 vagrant-1.6.5.tar.gz
+5fdb20727a3c3c31f33432ba7d5283a4 vagrant-1.7.2.tar.gz
98ac8bf95f729d8fd6cb61480c112fae vagrant-spec-c0dafc996165bf1628b672dd533f1858ff66fe4a.tar.gz
diff --git a/vagrant.spec b/vagrant.spec
index b715bd1..397fa2c 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -3,8 +3,8 @@
%global vagrant_spec_commit c0dafc996165bf1628b672dd533f1858ff66fe4a
Name: vagrant
-Version: 1.6.5
-Release: 18%{?dist}
+Version: 1.7.2
+Release: 1%{?dist}
Summary: Build and distribute virtualized development environments
Group: Development/Languages
License: MIT
@@ -24,7 +24,7 @@ Source4: macros.vagrant
# fails on older Fedoras.
%{?load:%{SOURCE4}}
-Patch0: vagrant-1.6.5-fix-dependencies.patch
+Patch0: vagrant-1.7.2-fix-dependencies.patch
Requires: ruby(release)
Requires: ruby(rubygems) >= 1.3.6
@@ -62,6 +62,9 @@ BuildRequires: rubygem(erubis)
BuildRequires: rubygem(rb-inotify)
BuildRequires: rubygem(rspec) < 3
BuildRequires: rubygem(bundler)
+BuildRequires: rubygem(net-sftp)
+BuildRequires: rubygem(rest-client)
+BuildRequires: rubygem(webmock)
BuildRequires: pkgconfig(bash-completion)
BuildArch: noarch
@@ -122,10 +125,6 @@ sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name
# it as a ghost file further down - will not be packaged.
touch %{buildroot}%{_sharedstatedir}/%{name}/plugins.json
-# Adjust permissions.
-# https://github.com/mitchellh/vagrant/pull/5220
-chmod 0644 %{buildroot}%{vagrant_dir}/plugins/communicators/winrm/command_filters/mkdir.rb
-
# Prepare vagrant plugins directory structure.
for i in \
%{vagrant_plugin_instdir} \
@@ -150,6 +149,10 @@ sed -i '/git/ s/^/#/' ../vagrant-spec/vagrant-spec.gemspec
# Relax the thor dependency, since Fedora ships with newer version.
sed -i '/thor/ s/~>/>=/' ../vagrant-spec/vagrant-spec.gemspec
+#Insert new test dependencies
+sed -i '25 i\ spec.add_dependency "webmock"' ../vagrant-spec/vagrant-spec.gemspec
+sed -i '26 i\ spec.add_dependency "fake_ftp"' ../vagrant-spec/vagrant-spec.gemspec
+
# TODO: winrm is not in Fedora yet.
rm -rf test/unit/plugins/communicators/winrm
sed -i '/it "eager loads WinRM" do/,/^ end$/ s/^/#/' test/unit/vagrant/machine_test.rb
@@ -208,6 +211,11 @@ getent group vagrant >/dev/null || groupadd -r vagrant
%changelog
+* Thu Feb 12 2015 Tomas Hrcka <thrcka at redhat.com> - 1.7.2-1
+- Update to latest upstream version 1.7.2
+- Backport dependencies fix patch
+- Remove permissions fix on mkdir.rb
+
* Mon Jan 26 2015 Vít Ondruch <vondruch at redhat.com> - 1.6.5-18
- Prepare and own plugin directory structure.
More information about the scm-commits
mailing list