Accepting request 127560 from devel:languages:ruby

- rename $bin19 binaries to $bin

OBS-URL: https://build.opensuse.org/request/show/127560
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ruby?expand=0&rev=34
This commit is contained in:
Stephan Kulow 2012-07-12 12:49:58 +00:00 committed by Git OBS Bridge
commit 677210366f
3 changed files with 22 additions and 8 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

View File

@ -1,8 +1,7 @@
%gem_install %{gem19_install}
%rubygems_requires %{rubygems19_requires}
%rb_binary %{rb19_binary}
%gem_binary /usr/bin/gem
%gem_binary /usr/bin/gem1.9
%rb_arch %{rb19_arch}
%rb_ver %{rb19_ver}
@ -56,11 +55,20 @@ cd $GEMSPEC_SOURCE_DIR && %{gem_binary} build --verbose *.gemspec \
#
%gem_install() \
if [ %# -ge 1 ]; then \
%{gem_binary} install --verbose --local --build-root=%{buildroot} %* \
%{gem_binary} install --verbose --local --build-root=%{buildroot} %* ;\
else \
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 \
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}
%gem_cleanup() \

View File

@ -97,8 +97,8 @@ ln -s %_libdir/libruby1.9.so $RPM_BUILD_ROOT%_libdir/libruby.so
install -D -m 0644 %{S:0} $RPM_BUILD_ROOT/etc/rpm/macros.ruby
install -D -m 0644 %{S:3} $RPM_BUILD_ROOT/etc/rpm/macros.common-ruby
install -D -m 0644 %{S:2} $RPM_BUILD_ROOT/etc/gemrc
install -D -m 0644 %{S:4} $RPM_BUILD_ROOT/%{_rpmconfigdir}/fileattrs/rubygems.attr
install -D -m 0755 %{S:5} $RPM_BUILD_ROOT/%{_rpmconfigdir}/rubygemsdeps.sh
install -D -m 0644 %{S:4} $RPM_BUILD_ROOT/usr/lib/rpm/fileattrs/rubygems.attr
install -D -m 0755 %{S:5} $RPM_BUILD_ROOT/usr/lib/rpm/rubygemsdeps.sh
export NO_BRP_STALE_LINK_ERROR=yes
%files
@ -115,8 +115,9 @@ export NO_BRP_STALE_LINK_ERROR=yes
%defattr(-,root,root)
/etc/gemrc
/etc/rpm/macros.common-ruby
%{_rpmconfigdir}/fileattrs/rubygems.attr
%{_rpmconfigdir}/rubygemsdeps.sh
%dir /usr/lib/rpm/fileattrs
/usr/lib/rpm/fileattrs/rubygems.attr
/usr/lib/rpm/rubygemsdeps.sh
%_bindir/gem_build_cleanup
%changelog