Accepting request 1075303 from home:robert_munteanu:branches:devel:kubic

Overhaul of completion packages for kubernetes 1.20-1.26

OBS-URL: https://build.opensuse.org/request/show/1075303
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.25?expand=0&rev=5

kubernetes1.25.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Mar 27 09:24:52 UTC 2023 - Robert Munteanu <rombert@apache.org>
+
+- Stronger conflicts for completion packages 
+
+-------------------------------------------------------------------
+Mon Mar 27 08:53:20 UTC 2023 - Robert Munteanu <rombert@apache.org>
+
+- Split individual completions into separate packages
+
 -------------------------------------------------------------------
 Tue Mar 21 08:00:04 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>
 

kubernetes1.25.spec

@@ -49,7 +49,6 @@ Patch3:         opensuse-version-checks.patch
 Patch4:         kubeadm-opensuse-flexvolume.patch
 # Patch to revert renaming of coredns image location to match how it's done on download.opensuse.org
 Patch5:         revert-coredns-image-renaming.patch
-BuildRequires:  bash-completion
 BuildRequires:  fdupes
 BuildRequires:  git
 BuildRequires:  go-go-md2man
@@ -69,6 +68,8 @@ for management and discovery.
 
 
 
+
+
 # packages to build containerized control plane
 %package apiserver
 Summary:        Kubernetes apiserver for container image
@@ -177,6 +178,35 @@ Recommends:     bash-completion
 %description client-common
 Kubernetes client tools common files
 
+%package client-bash-completion
+Summary:        Bash Completion for %{name}-client
+Group:          System/Shells
+BuildRequires:  bash-completion
+Requires:       bash-completion
+Requires:       kubernetes%{baseversion}-client = %{version}
+Supplements:    (kubernetes%{baseversion}-client and bash-completion)
+BuildArch:      noarch
+Obsoletes:      kubernetes%{baseversionminus1}-client-bash-completion
+Provides:       kubernetes-client-bash-completion = %{version}
+Conflicts:      kubernetes-client-bash-completion
+
+%description client-bash-completion
+Bash command line completion support for %{name}-client
+
+%package client-fish-completion
+Summary:        Fish Completion for %{name}-client
+Group:          System/Shells
+BuildRequires:  fish
+Requires:       kubernetes%{baseversion}-client = %{version}
+Supplements:    (kubernetes%{baseversion}-client and fish)
+BuildArch:      noarch
+Obsoletes:      kubernetes%{baseversionminus1}-client-fish-completion
+Provides:       kubernetes-client-fish-completion = %{version}
+Conflicts:      kubernetes-client-fish-completion
+
+%description client-fish-completion
+Fish command line completion support for %{name}-client.
+
 %prep
 %setup -q -n kubernetes-%{version}
 %patch2 -p1
@@ -249,6 +279,10 @@ install -D -m 0644 %{SOURCE22} %{buildroot}%{_fillupdir}/sysconfig.kubelet-kuber
 install -d -m 0755 %{buildroot}%{_datadir}/bash-completion/completions/
 %{buildroot}%{_bindir}/kubectl%{baseversion} completion bash > %{buildroot}%{_datadir}/bash-completion/completions/kubectl
 
+# install the fish completion
+mkdir -p %{buildroot}%{_datadir}/fish/vendor_completions.d
+%{buildroot}%{_bindir}/kubectl%{baseversion} completion fish > %{buildroot}%{_datadir}/fish/vendor_completions.d/kubectl.fish
+
 # move CHANGELOG-%{baseversion}.md to old location
 mv CHANGELOG/CHANGELOG-%{baseversion}.md .
 
@@ -402,6 +436,11 @@ fi
 %license LICENSE
 %{_mandir}/man1/kubectl.1%{?ext_man}
 %{_mandir}/man1/kubectl-*
+
+%files client-bash-completion
 %{_datadir}/bash-completion/completions/kubectl
 
+%files client-fish-completion
+%{_datadir}/fish/vendor_completions.d/kubectl.fish
+
 %changelog