Documentation cleanups

diff --git a/README b/README
index b654394..f1c950b 100644 (file)
--- a/README
+++ b/README
@@ -1,12 +1,10 @@
-This is a fork of <http://github.com/wayneeseguin/rvm>. I added branches `rpm` and `rpmtest`. The main branch to use is `rpm`.
+This is basically a .spec file which builds and packages RVM and selected Rubies & Gems into a RPM. RVM is installed system-wide for all users and is ready to use immediately, with no compilation needed on the target machine.

 
 

-I do not plan to work on RVM. I simply added a `rpm` folder which contains a `rvm-ruby.spec` and a script to create the RPM from the sources.
-
-Just clone this repo, customize the rubies and gems needed as indicated below, go at the root, and launch:
+Just clone this repo, customize the rubies and gems needed as indicated below and launch:

 
     ./rpm/create_rpm_from_here
 
 
     ./rpm/create_rpm_from_here
 

-The `rvm-ruby.spec` file is based on <https://github.com/mdkent/rvm-rpm/blob/master/SPECS/rvm-ruby.spec>. I applied some customizations to make it compatibe with the small script i made to create the RPM. What i added is at the end of the `%install` section, beginning at
+The `rvm-ruby.spec` file is based on <https://github.com/mdkent/rvm-rpm/blob/master/SPECS/rvm-ruby.spec>. I applied some customizations to make it compatibe with the small script I made to create the RPM. What i added is at the end of the `%install` section, beginning at

 
     # At this point, install of RVM is finished
     # Now install some rubies
 
     # At this point, install of RVM is finished
     # Now install some rubies


@@ -17,6 +15,6 @@ The `rvm-ruby.spec` file is based on <https://github.com/mdkent/rvm-rpm/blob/mas
     gem install bundler --no-ri --no-rdoc
     (...)
 
     gem install bundler --no-ri --no-rdoc
     (...)
 

-There, i added instructions to build and packages some rubies and gems i want to deploy on all my servers. Up to you to modify that for your own needs.
+There, I added instructions to build and packages some rubies and gems i want to deploy on all my servers. Up to you to modify that for your own needs.

 
 

-Last time i checked, it did not work on the `master` branch or RVM. It works with the `stable` branch.
+Tested with stable RVM version 1.20.10

diff --git a/rpm/rvm-ruby.spec b/rpm/rvm-ruby.spec
index 284109e..648cb53 100644 (file)
--- a/rpm/rvm-ruby.spec
+++ b/rpm/rvm-ruby.spec
@@ -6,11 +6,11 @@
 
 Name: rvm-ruby
 Summary: Ruby Version Manager
 
 Name: rvm-ruby
 Summary: Ruby Version Manager

-Version: 4  # Version will be appended the commit date
-# choose a version from https://github.com/wayneeseguin/rvm/tags
+Version: 4  # Commit date will be appended
+# pick a RVM version from https://github.com/wayneeseguin/rvm/tags

 Release: 1.20.10
 License: ASL 2.0
 Release: 1.20.10
 License: ASL 2.0

-URL: http://rvm.beginrescueend.com/
+URL: http://rvm.io/

 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
 


@@ -27,7 +27,7 @@ Requires: gcc-c++ patch readline readline-devel zlib-devel libyaml-devel libffi-
 Requires: sed grep tar gzip bzip2 make file
 
 %description
 Requires: sed grep tar gzip bzip2 make file
 
 %description

-RVM is the Ruby Version Manager (rvm). It manages Ruby interpreter environments
+RVM is the Ruby Version Manager. It manages Ruby interpreter environments

 and switching between them.
 
 This package is meant for use by multiple users maintaining a shared copy of
 and switching between them.
 
 This package is meant for use by multiple users maintaining a shared copy of


@@ -39,8 +39,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.
 
 RVM is activated for all logins by default. To disable remove
 %{_sysconfdir}/profile.d/rvm.sh and source rvm from each users shell.
 

-%build
-

 %install
 rm -rf %{buildroot}
 
 %install
 rm -rf %{buildroot}
 


@@ -110,7 +108,6 @@ export rvm_man_path="%{buildroot}%{_mandir}"
 source ${rvm_path}/scripts/rvm
 gemi='gem install --no-ri --no-rdoc'
 
 source ${rvm_path}/scripts/rvm
 gemi='gem install --no-ri --no-rdoc'
 

-#touch $rvm_path/RELEASE

 ruby_tag=ruby-1.9.3-p286
 rvm install $ruby_tag
 rvm use $ruby_tag
 ruby_tag=ruby-1.9.3-p286
 rvm install $ruby_tag
 rvm use $ruby_tag


@@ -125,11 +122,6 @@ rvm cleanup all
 
 export br=%{buildroot}
 
 
 export br=%{buildroot}
 

-# Remove sources
-rm -rf $br/usr/lib/rvm/src/*
-# Remove logfiles
-find $br/usr/lib/rvm/log -type f -exec rm {} \;
-

 # Strip binaries
 #find $br -type f -print0 |xargs -0 file --no-dereference --no-pad |grep 'not stripped' |cut -f1 -d: |xargs -r strip
 
 # Strip binaries
 #find $br -type f -print0 |xargs -0 file --no-dereference --no-pad |grep 'not stripped' |cut -f1 -d: |xargs -r strip