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

Use upstream fish completions and obsolete external package

OBS-URL: https://build.opensuse.org/request/show/1071526
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.24?expand=0&rev=7
This commit is contained in:
Priyanka Saggu 2023-03-15 04:57:49 +00:00 committed by Git OBS Bridge
parent 0bb17901f9
commit ac844dc133
2 changed files with 16 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 9 10:15:46 UTC 2023 - Robert Munteanu <rombert@apache.org>
- Use upstream fish completions and obsolete external package
-------------------------------------------------------------------
Thu Mar 2 13:14:29 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>

View File

@ -51,6 +51,7 @@ Patch4: kubeadm-opensuse-flexvolume.patch
Patch5: revert-coredns-image-renaming.patch
BuildRequires: bash-completion
BuildRequires: fdupes
BuildRequires: fish
BuildRequires: git
BuildRequires: go-go-md2man
BuildRequires: golang-packaging
@ -69,6 +70,9 @@ for management and discovery.
# packages to build containerized control plane
%package apiserver
@ -173,7 +177,9 @@ Requires: kubernetes%{baseversion}-client
Provides: kubernetes-client-common = %{version}
Conflicts: kubernetes-client-common
Obsoletes: kubernetes%{baseversionminus1}-client-common
Obsoletes: kubernetes-client-fish-completion
Recommends: bash-completion
Recommends: fish
%description client-common
Kubernetes client tools common files
@ -250,6 +256,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 .
@ -404,5 +414,6 @@ fi
%{_mandir}/man1/kubectl.1%{?ext_man}
%{_mandir}/man1/kubectl-*
%{_datadir}/bash-completion/completions/kubectl
%{_datadir}/fish/vendor_completions.d/kubectl.fish
%changelog