Accepting request 34190 from home:gberh:branches:shells

Copy from home:gberh:branches:shells/ksh via accept of submit request 34190 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/34190
OBS-URL: https://build.opensuse.org/package/show/shells/ksh?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2010-03-07 08:01:54 +00:00 committed by Git OBS Bridge
parent 4649e86bc6
commit b29186dc79
2 changed files with 15 additions and 2 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 5 20:07:06 UTC 2010 - guido+opensuse.org@berhoerster.name
- Add forgotten preun scriptlet for update-alternatives
- Fixed typo
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 5 14:38:39 CET 2010 - werner@suse.de Fri Mar 5 14:38:39 CET 2010 - werner@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package ksh (Version 93t) # spec file for package ksh (Version 93t)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -431,7 +431,7 @@ test -e etc/bash.bashrc && ln -sf bash.bashrc etc/ksh.kshrc || true
%if %suse_version > 1120 %if %suse_version > 1120
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--install /bin/ksh ksh /%{_lib}/ast/bin/ksh 20 \ --install /bin/ksh ksh /%{_lib}/ast/bin/ksh 20 \
--slave %{_bindir}/ksh usr-bin-ksh /%{_lib}/ast/bin/ksh \ --slave %{_bindir}/ksh usr-bin-ksh /%{_lib}/ast/bin/ksh \
--slave %{_mandir}/man1/ksh.1.gz ksh.1.gz %{_mandir}/man1/ksh93.1.gz --slave %{_mandir}/man1/ksh.1.gz ksh.1.gz %{_mandir}/man1/ksh93.1.gz
%else %else
if test -x %{_lib}/ast/bin/ksh ; then if test -x %{_lib}/ast/bin/ksh ; then
@ -442,6 +442,13 @@ if test -x %{_lib}/ast/bin/ksh ; then
fi fi
%endif %endif
%if %suse_version > 1120
%preun
if [ $1 -eq 0 ]; then
/usr/sbin/update-alternatives --remove ksh /%{_lib}/ast/bin/ksh
fi
%endif
%postun %postun
if test ! -x %{_lib}/ast/bin/ksh ; then if test ! -x %{_lib}/ast/bin/ksh ; then
if test ! -x bin/pdksh ; then if test ! -x bin/pdksh ; then