From c8edd27a07ba888b15bd883d3a1f6f3a6632e5f4ffc33ea780c8c6d7029a0f12 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 25 Jun 2013 09:11:49 +0000 Subject: [PATCH] Accepting request 180818 from OBS:Server:Unstable - remove --force usage in favor of portable rm (SLE11) OBS-URL: https://build.opensuse.org/request/show/180818 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby?expand=0&rev=61 --- ruby.changes | 5 +++++ ruby.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ruby.changes b/ruby.changes index e8713ff..a437220 100644 --- a/ruby.changes +++ b/ruby.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 25 09:02:48 UTC 2013 - coolo@suse.com + +- remove --force usage in favor of portable rm (SLE11) + ------------------------------------------------------------------- Tue Jun 4 17:04:50 UTC 2013 - coolo@suse.com diff --git a/ruby.spec b/ruby.spec index 06e8ab5..162768e 100644 --- a/ruby.spec +++ b/ruby.spec @@ -94,7 +94,9 @@ install -D -m 0644 %{S:2} $RPM_BUILD_ROOT/etc/gemrc %post for bin in erb gem irb rake rdoc ri ruby testrb; do - /usr/sbin/update-alternatives --force --install \ + # remove non-links or old binaries will stay around forever + test -L %{_bindir}/$bin || rm -v %{_bindir}/$bin + /usr/sbin/update-alternatives --install \ %{_bindir}/$bin $bin %{_bindir}/$bin"2.0" 20 done