From d254773e57622a205c5e0a60c0f5d16eff1f6f3e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 29 Apr 2020 11:13:33 +0000 Subject: [PATCH] Accepting request 795456 from home:kukuk:branches:Base:System - Fix usage of update-alternatives OBS-URL: https://build.opensuse.org/request/show/795456 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=311 --- bash.changes | 5 +++++ bash.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bash.changes b/bash.changes index 9a2dd690..21d4d700 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 19 08:03:03 UTC 2020 - Thorsten Kukuk + +- Fix usage of update-alternatives + ------------------------------------------------------------------- Fri Apr 3 08:28:08 UTC 2020 - Dr. Werner Fink diff --git a/bash.spec b/bash.spec index 57ce4665..a5d1ebf5 100644 --- a/bash.spec +++ b/bash.spec @@ -455,11 +455,10 @@ test ${rl1[2]} = ${rl2[2]} || exit 1 # remains here :( # The same had happen for the system POSIX shell /bin/sh # - ln -sf %{_bindir}/bash %{buildroot}%{_sysconfdir}/alternatives/sh ln -sf %{_bindir}/bash %{buildroot}/bin/bash ln -sf %{_bindir}/sh %{buildroot}/bin/sh ln -sf bash %{buildroot}%{_bindir}/rbash - ln -sf bash %{buildroot}%{_bindir}/sh + ln -sf %{_sysconfdir}/alternatives/sh %{buildroot}%{_bindir}/sh install -m 644 COMPAT NEWS %{buildroot}%{_docdir}/%{name} install -m 644 COPYING %{buildroot}%{_docdir}/%{name} install -m 644 doc/FAQ %{buildroot}%{_docdir}/%{name} @@ -530,7 +529,7 @@ ldd -u -r %{buildroot}/bin/bash || true %{_bindir}/bash %{_bindir}/bashbug %{_bindir}/rbash -%verify(not link mtime) %{_bindir}/sh +%{_bindir}/sh %dir %{_datadir}/bash %dir %{_datadir}/bash/helpfiles %{_datadir}/bash/helpfiles/*