[packages/vagrant] BR bash as skel files used from there; cosmetics

glen glen at pld-linux.org
Thu Nov 7 21:08:20 CET 2013


commit 844c04d14cef0fca34ce05c707f23ac28b9e4079
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 7 22:04:10 2013 +0200

    BR bash as skel files used from there; cosmetics

 vagrant.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/vagrant.spec b/vagrant.spec
index 4519fba..5f2cdc7 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -12,6 +12,7 @@ Patch0:		source_root.patch
 Patch1:		rubygems.patch
 Patch2:		no-warning.patch
 URL:		http://www.vagrantup.com/
+BuildRequires:	bash
 BuildRequires:	rpm-rubyprov
 BuildRequires:	ruby-contest >= 0.1.2
 BuildRequires:	ruby-minitest >= 2.5.1
@@ -26,8 +27,8 @@ Requires:	curl
 Requires:	ruby-childprocess >= 0.3.7
 Requires:	ruby-erubis >= 2.7.0
 Requires:	ruby-i18n >= 0.6.0
-Requires:	ruby-log4r >= 1.1.9
 Requires:	ruby-json
+Requires:	ruby-log4r >= 1.1.9
 Requires:	ruby-net-scp >= 1.1.0
 Requires:	ruby-net-ssh >= 2.6.6
 Requires:	ruby-rubygems
@@ -116,14 +117,14 @@ cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 cp -a config keys plugins templates $RPM_BUILD_ROOT%{_appdir}
 
 install -d $RPM_BUILD_ROOT%{bash_compdir}
-mv contrib/bash/completion.sh $RPM_BUILD_ROOT%{bash_compdir}/%{name}
+cp -p contrib/bash/completion.sh $RPM_BUILD_ROOT%{bash_compdir}/%{name}
 
 # guest
 install -d $RPM_BUILD_ROOT/etc/sudoers.d
 echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > $RPM_BUILD_ROOT/etc/sudoers.d/%{name}
 
 install -d $RPM_BUILD_ROOT{%{vg_root},%{vg_home}/.ssh}
-cp -a /etc/skel/.bash*  $RPM_BUILD_ROOT%{vg_home}
+cp -p /etc/skel/.bash*  $RPM_BUILD_ROOT%{vg_home}
 
 # Since Vagrant only supports key-based authentication for SSH, we must
 # set up the vagrant user to use key-based authentication. We can get the
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vagrant.git/commitdiff/e4c3e8b40c4dca9857eb015325a6676263f3e941



More information about the pld-cvs-commit mailing list