Adds ruby dependency, gets rid of source tarball

diff --git a/rpm/create_rpm_from_here b/rpm/create_rpm_from_here
index 9e62023..a6dfd59 100755 (executable)
--- a/rpm/create_rpm_from_here
+++ b/rpm/create_rpm_from_here
@@ -20,10 +20,10 @@ rm -rf rpmbuild
 mkdir -p rpmbuild/{BUILD,RPMS,SOURCES/$name-$version,SPECS,SRPMS,tmp}
 cp -a rpm/$specfile rpmbuild/SPECS
 sed -i "s/^[\t ]*Version:.*\$/Version: ${version}/" rpmbuild/SPECS/$specfile
-tar --exclude-vcs --exclude='rpmbuild' --exclude='rpm' -cp * | (cd rpmbuild/SOURCES/$name-$version ; tar xp)
+#tar --exclude-vcs --exclude='rpmbuild' --exclude='rpm' -cp * | (cd rpmbuild/SOURCES/$name-$version ; tar xp)
 
 pushd rpmbuild/SOURCES
-tar cf $name-$version.tar $name-$version  # Best not to use cpu on our small ec2 instances
+#tar cf $name-$version.tar $name-$version  # Best not to use cpu on our small ec2 instances
 #sed -i "s/^[\t ]*Source0:.*/Source0: $name-$version.tar/g" rpmbuild/SPECS/*.spec
 #sed -i "s/^[\t ]*%setup[\t ]\+-n[\t ]\+.*/%setup -n $name-$version/g" rpmbuild/SPECS/*.spec
 popd

diff --git a/rpm/rvm-ruby.spec b/rpm/rvm-ruby.spec
index 10dc1d0..ff4042c 100644 (file)
--- a/rpm/rvm-ruby.spec
+++ b/rpm/rvm-ruby.spec
@@ -11,13 +11,13 @@ Release: 1.20.9
 License: ASL 2.0
 URL: http://rvm.beginrescueend.com/
 Group: Applications/System
-
+#Source: %{name}-%{version}.tar
 #BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 
 BuildRequires: bash curl git
 BuildRequires: gcc-c++ patch chrpath readline readline-devel zlib-devel libyaml-devel libffi-devel openssl-devel
-BuildRequires: sed grep tar gzip bzip2 make file
+BuildRequires: sed grep tar gzip bzip2 make file ruby
 
 Requires(pre): shadow-utils
 # For rvm
@@ -40,9 +40,6 @@ ensure correct permissions for the shared RVM content.
 RVM is activated for all logins by default. To disable remove
 %{_sysconfdir}/profile.d/rvm.sh and source rvm from each users shell.
 
-%prep
-%setup -q
-
 %build
 
 %install
@@ -53,6 +50,7 @@ for i in `env | grep ^rvm_ | cut -d"=" -f1`; do
   unset $i;
 done
 
+(
 # Install everything into one directory
 export rvm_ignore_rvmrc=1 \
   rvm_user_install_flag=0 \
@@ -60,9 +58,9 @@ export rvm_ignore_rvmrc=1 \
   rvm_bin_path="%{buildroot}%{_bindir}" \
   rvm_man_path="%{buildroot}%{_mandir}" \
   HOME=%{buildroot}
-
 \curl -L https://get.rvm.io | bash -s stable --version %{release}
   #./install
+)
 
 # So members of the rvm group can write to it
 find %{buildroot}%{rvm_dir} -exec chmod ug+w {} \;