summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <madam@redhat.com>2015-01-22 12:25:31 +0100
committerMichael Adam <obnox@samba.org>2015-01-22 12:30:03 +0100
commitcce3ed17bcd423c1c3d523de5e600085ba102a8f (patch)
tree4f710f8834031fe5d6c09f88092a30a68075f013
parent15c0557a2220d7b2000cb5f8a6b83f968b60ca1e (diff)
downloadfedora-vagrant-cce3ed17bcd423c1c3d523de5e600085ba102a8f.tar.gz
fedora-vagrant-cce3ed17bcd423c1c3d523de5e600085ba102a8f.tar.xz
fedora-vagrant-cce3ed17bcd423c1c3d523de5e600085ba102a8f.zip
Clean up old vagrant-spec directory in %check first.
Otherwise, in a build environment that has not been cleaned up before, the following mv command moves the vagrant-spec-$HASH directory into the existing vagrant-spec dir which is not the desired effect...
-rw-r--r--vagrant.spec6
1 files changed, 5 insertions, 1 deletions
diff --git a/vagrant.spec b/vagrant.spec
index 8b1a7f5..156e225 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -4,7 +4,7 @@
Name: vagrant
Version: 1.6.5
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Build and distribute virtualized development environments
Group: Development/Languages
License: MIT
@@ -130,6 +130,7 @@ chmod 0644 %{buildroot}%{vagrant_dir}/plugins/communicators/winrm/command_filter
%check
# Unpack the vagran-spec and adjust the directory name.
+rm -rf ../vagrant-spec
tar xvzf %{S:2} -C ..
mv ../vagrant-spec{-%{vagrant_spec_commit},}
@@ -189,6 +190,9 @@ getent group vagrant >/dev/null || groupadd -r vagrant
%changelog
+* Thu Jan 22 2015 Michael Adam <madam@redhat.com> - 1.6.5-17
+- Fix %check in an unclean build environment.
+
* Tue Jan 20 2015 Vít Ondruch <vondruch@redhat.com> - 1.6.5-16
- Minor review fixes.