summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVít Ondruch <vondruch@redhat.com>2014-12-23 12:19:36 +0100
committerVít Ondruch <vondruch@redhat.com>2015-01-21 12:53:03 +0100
commit9e863214ace1539b1b61d5bc73a3a9a18c26b26c (patch)
tree41aae48d22ae3074ed5d98bdd86a44972a2e99fc
parent013ac092a5950818b320746f70c3b7481b4f5e1e (diff)
downloadfedora-vagrant-9e863214ace1539b1b61d5bc73a3a9a18c26b26c.tar.gz
fedora-vagrant-9e863214ace1539b1b61d5bc73a3a9a18c26b26c.tar.xz
fedora-vagrant-9e863214ace1539b1b61d5bc73a3a9a18c26b26c.zip
Relax thor dependency to keep up with Fedora.
-rw-r--r--vagrant.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/vagrant.spec b/vagrant.spec
index 81de19a..25a8a9d 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -4,7 +4,7 @@
Name: vagrant
Version: 1.6.5
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Build and distribute virtualized development environments
Group: Development/Languages
License: MIT
@@ -125,6 +125,9 @@ mv ../vagrant-spec{-%{vagrant_spec_commit},}
# Remove the git reference, which is useless in our case.
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
+
# 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
@@ -171,6 +174,9 @@ getent group vagrant >/dev/null || groupadd -r vagrant
%changelog
+* Tue Dec 23 2014 Vít Ondruch <vondruch@redhat.com> - 1.6.5-15
+- Relax thor dependency to keep up with Fedora.
+
* Wed Nov 26 2014 Vít Ondruch <vondruch@redhat.com> - 1.6.5-14
- Drop -devel sub-package.