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
we have swapped release and version, so this is required
[rvm-ruby.git]
/
rpm
/
rvm-ruby.spec
diff --git
a/rpm/rvm-ruby.spec
b/rpm/rvm-ruby.spec
index
648cb53
..
3050fb7
100644
(file)
--- a/
rpm/rvm-ruby.spec
+++ b/
rpm/rvm-ruby.spec
@@
-4,11
+4,17
@@
# 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 # Commit date will be appended
+# PL conventions
+%define name rvm-ruby
# pick a RVM version from https://github.com/wayneeseguin/rvm/tags
# pick a RVM version from https://github.com/wayneeseguin/rvm/tags
-Release: 1.20.10
+%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
URL: http://rvm.io/
Group: Applications/System
License: ASL 2.0
URL: http://rvm.io/
Group: Applications/System
@@
-43,7
+49,7
@@
RVM is activated for all logins by default. To disable remove
rm -rf %{buildroot}
# Clean the env
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
@@
-54,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
@@
-127,12
+133,12
@@
export br=%{buildroot}
# Strip and Fix bad paths in generated files
# That is not optimized, but that is not supposed to be done often
# 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
@@
-146,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
$(readlink -f $f |sed "s,$br,,")
$f
done
find $br -maxdepth 1 -name '.*' -exec rm -rf {} \;
done
find $br -maxdepth 1 -name '.*' -exec rm -rf {} \;