Accepting request 960504 from home:dirkmueller:branches:openSUSE:Factory:Rings:1-MinimalX

- avoid bashism in client-common postinstall script (bsc#1195391)

OBS-URL: https://build.opensuse.org/request/show/960504
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.22?expand=0&rev=11
This commit is contained in:
Richard Brown 2022-03-10 12:03:44 +00:00 committed by Git OBS Bridge
parent cf62f89c5e
commit aff96d2468
2 changed files with 8 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Feb 7 16:21:21 UTC 2022 - Dirk Müller <dmueller@suse.com>
- avoid bashism in client-common postinstall script (bsc#1195391)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 17 10:02:26 UTC 2021 - Richard Brown <rbrown@suse.com> Fri Dec 17 10:02:26 UTC 2021 - Richard Brown <rbrown@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file # spec file
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2022 SUSE LLC
# #
# 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
@ -68,8 +68,8 @@ management of containerized applications.
It groups containers that make up an application into logical units It groups containers that make up an application into logical units
for management and discovery. for management and discovery.
# packages to build containerized control plane
# packages to build containerized control plane
%package apiserver %package apiserver
Summary: Kubernetes apiserver for container image Summary: Kubernetes apiserver for container image
Group: System/Management Group: System/Management
@ -303,9 +303,8 @@ ln -s -f %{_sysconfdir}/alternatives/kubectl %{buildroot}%{_bindir}/kubectl
%fdupes -s %{buildroot} %fdupes -s %{buildroot}
%post client-common %post client-common
export baseversion="%{baseversion}"
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--install %{_bindir}/kubectl kubectl %{_bindir}/kubectl%{baseversion} ${baseversion/./} --install %{_bindir}/kubectl kubectl %{_bindir}/kubectl%{baseversion} %(echo %{baseversion} | tr -d .)
%postun client-common %postun client-common
if [ ! -f %{_bindir}/kubectl%{baseversion} ] ; then if [ ! -f %{_bindir}/kubectl%{baseversion} ] ; then