- rename $bin19 binaries to $bin

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby?expand=0&rev=36
This commit is contained in:
Stephan Kulow 2012-07-09 05:18:17 +00:00 committed by Git OBS Bridge
parent 5c82dd3e1e
commit bb63ee48ea
2 changed files with 17 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 9 05:17:40 UTC 2012 - coolo@suse.com
- rename $bin19 binaries to $bin
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 4 08:59:02 UTC 2012 - saschpe@suse.de Wed Jul 4 08:59:02 UTC 2012 - saschpe@suse.de

View File

@ -1,8 +1,7 @@
%gem_install %{gem19_install}
%rubygems_requires %{rubygems19_requires} %rubygems_requires %{rubygems19_requires}
%rb_binary %{rb19_binary} %rb_binary %{rb19_binary}
%gem_binary /usr/bin/gem %gem_binary /usr/bin/gem1.9
%rb_arch %{rb19_arch} %rb_arch %{rb19_arch}
%rb_ver %{rb19_ver} %rb_ver %{rb19_ver}
@ -56,11 +55,20 @@ cd $GEMSPEC_SOURCE_DIR && %{gem_binary} build --verbose *.gemspec \
# #
%gem_install() \ %gem_install() \
if [ %# -ge 1 ]; then \ if [ %# -ge 1 ]; then \
%{gem_binary} install --verbose --local --build-root=%{buildroot} %* \ %{gem_binary} install --verbose --local --build-root=%{buildroot} %* ;\
else \ else \
GEM_FILE=`find . -maxdepth 2 -type f -name "%{mod_name}-%{version}.gem"` \ GEM_FILE=`find . -maxdepth 2 -type f -name "%{mod_name}-%{version}.gem"` \
%{gem_binary} install --verbose --local --bindir %{buildroot}%{_bindir} --install-dir %{buildroot}%{_libdir}/ruby/gems/%{rb_ver} $GEM_FILE \ %{gem_binary} install --verbose --local --bindir %{buildroot}%{_bindir} --install-dir %{buildroot}%{_libdir}/ruby/gems/%{rb_ver} $GEM_FILE \
fi \ fi; \
if test -d $RPM_BUILD_ROOT/usr/bin; then \
cd $RPM_BUILD_ROOT/usr/bin; \
bins=`ls -1 *1.9 2> /dev/null`; \
if test -n "$bins"; then \
for bin in $bins; do \
mv -v $bin $(echo "$bin" | sed -e 's,1.9$,,'); \
done ;\
fi ;\
fi ;\
%{nil} %{nil}
%gem_cleanup() \ %gem_cleanup() \