git://git.onelab.eu
/
rvm-ruby.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rough cleanup of the /etc/ area - should be kept pl-specific
[rvm-ruby.git]
/
rpm
/
rvm-ruby.spec
diff --git
a/rpm/rvm-ruby.spec
b/rpm/rvm-ruby.spec
index
284109e
..
63189a7
100644
(file)
--- a/
rpm/rvm-ruby.spec
+++ b/
rpm/rvm-ruby.spec
@@
-4,13
+4,19
@@
# RVM can not be sourced with default /bin/sh
%define _buildshell /bin/bash
# RVM can not be sourced with default /bin/sh
%define _buildshell /bin/bash
-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
-Release: 1.20.10
+# PL conventions
+%define name rvm-ruby
+# pick a RVM version from https://github.com/wayneeseguin/rvm/tags
+%define version 1.20.10
+%define taglevel 4
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+
+Summary: Ruby Version Manager (including Rubies and Gems)
+Name: %{name}
+Version: %{version}
+Release: %{release}
License: ASL 2.0
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
+33,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,13
+45,11
@@
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}
# Clean the env
%install
rm -rf %{buildroot}
# Clean the env
-for i in
`env | grep ^rvm_ | cut -d"=" -f1`
; do
+for i in
$(env | grep ^rvm_ | cut -d"=" -f1)
; do
unset $i;
done
unset $i;
done
@@
-56,7
+60,7
@@
export rvm_ignore_rvmrc=1 \
rvm_path="%{buildroot}%{rvm_dir}" \
rvm_man_path="%{buildroot}%{_mandir}" \
HOME=%{buildroot}
rvm_path="%{buildroot}%{rvm_dir}" \
rvm_man_path="%{buildroot}%{_mandir}" \
HOME=%{buildroot}
-\curl -L https://get.rvm.io | bash -s stable --version %{
release
}
+\curl -L https://get.rvm.io | bash -s stable --version %{
version
}
)
# So members of the rvm group can write to it
)
# So members of the rvm group can write to it
@@
-110,7
+114,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,22
+128,17
@@
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 and Fix bad paths in generated files
# That is not optimized, but that is not supposed to be done often
# Strip binaries
#find $br -type f -print0 |xargs -0 file --no-dereference --no-pad |grep 'not stripped' |cut -f1 -d: |xargs -r strip
# Strip and Fix bad paths in generated files
# That is not optimized, but that is not supposed to be done often
-for f in
`find $br -type f -print0 |xargs -0 file --no-dereference --no-pad |grep ': ELF' |cut -f1 -d:`
; do
+for f in
$(find $br -type f -print0 |xargs -0 file --no-dereference --no-pad |grep ': ELF' |cut -f1 -d:)
; do
strip $f
grep "$br" $f || continue
strip $f
grep "$br" $f || continue
- line=
`chrpath -l $f`
|| continue
+ line=
$(chrpath -l $f)
|| continue
echo $line |grep "$br" || continue
echo $line |grep "$br" || continue
- chrpath -r
`echo $line |cut -f2 -d= |sed "s,$br,,"`
$f
+ chrpath -r
$(echo $line |cut -f2 -d= |sed "s,$br,,")
$f
done
# Replace bad paths in text files
done
# Replace bad paths in text files
@@
-154,8
+152,8
@@
slashes=$(printf "%s" "${ch// //}")
find $br -type f -print0 | xargs -0 sed -i "s,$br,$slashes,g"
# Fix symlinks with bad path
find $br -type f -print0 | xargs -0 sed -i "s,$br,$slashes,g"
# Fix symlinks with bad path
-for f in
`find $br -type l |grep "$br"`
; do
- ln -sfn
`readlink -f $f |sed "s,$br,,"`
$f
+for f in
$(find $br -type l |grep "$br")
; do
+ ln -sfn
$(echo $f | sed "s,^$br,,")
$f
done
find $br -maxdepth 1 -name '.*' -exec rm -rf {} \;
done
find $br -maxdepth 1 -name '.*' -exec rm -rf {} \;
@@
-163,6
+161,9
@@
rm $br/usr/share/man/man1/rvm.1.gz
%clean
rm -rf %{buildroot}
%clean
rm -rf %{buildroot}
+# it appears that, because we build as root, rvm installs stuff in /etc on the build box
+# which is not desirable, so let us get rid of that - don't worry if that fails
+find /etc -name 'rvm*' | xargs rm || :
%pre
getent group %{rvm_group} >/dev/null || groupadd -r %{rvm_group}
%pre
getent group %{rvm_group} >/dev/null || groupadd -r %{rvm_group}