From aff96d24685fa3aa621cfc6cca4596c46ad75fbf0237d3f05cc12c21fc074483 Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Thu, 10 Mar 2022 12:03:44 +0000
Subject: [PATCH] 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
---
 kubernetes1.22.changes | 5 +++++
 kubernetes1.22.spec    | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kubernetes1.22.changes b/kubernetes1.22.changes
index a033b9c..5055c3b 100644
--- a/kubernetes1.22.changes
+++ b/kubernetes1.22.changes
@@ -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>
 
diff --git a/kubernetes1.22.spec b/kubernetes1.22.spec
index 728e14e..8453235 100644
--- a/kubernetes1.22.spec
+++ b/kubernetes1.22.spec
@@ -1,7 +1,7 @@
 #
 # spec file
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # 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
 for management and discovery.
 
-# packages to build containerized control plane
 
+# packages to build containerized control plane
 %package apiserver
 Summary:        Kubernetes apiserver for container image
 Group:          System/Management
@@ -303,9 +303,8 @@ ln -s -f %{_sysconfdir}/alternatives/kubectl %{buildroot}%{_bindir}/kubectl
 %fdupes -s %{buildroot}
 
 %post client-common
-export baseversion="%{baseversion}"
 %{_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
 if [ ! -f %{_bindir}/kubectl%{baseversion} ] ; then