Accepting request 1075302 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/1075302
OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.24?expand=0&rev=10
This commit is contained in:
Priyanka Saggu 2023-03-30 08:06:07 +00:00 committed by Git OBS Bridge
parent 360bc5c48a
commit bfe73bf28b
2 changed files with 25 additions and 8 deletions

View File

@ -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:55:16 UTC 2023 - Robert Munteanu <rombert@apache.org>
- Add proper obsoletes for completion packages
-------------------------------------------------------------------
Tue Mar 21 07:46:49 UTC 2023 - Priyanka Saggu <priyanka.saggu@suse.com>

View File

@ -49,9 +49,7 @@ 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: fish
BuildRequires: git
BuildRequires: go-go-md2man
BuildRequires: golang-packaging
@ -69,6 +67,8 @@ It groups containers that make up an application into logical units
for management and discovery.
# packages to build containerized control plane
%package apiserver
@ -180,10 +180,14 @@ Kubernetes client tools common files
%package client-bash-completion
Summary: Bash Completion for %{name}-client
Group: System/Shells
Requires: %{name}-client = %{version}
BuildRequires: bash-completion
Requires: bash-completion
Supplements: (%{name}-client and 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
@ -191,13 +195,16 @@ Bash command line completion support for %{name}-client
%package client-fish-completion
Summary: Fish Completion for %{name}-client
Group: System/Shells
Requires: %{name}-client = %{version}
Supplements: (%{name}-client and fish)
BuildRequires: fish
Requires: kubernetes%{baseversion}-client = %{version}
Supplements: (kubernetes%{baseversion}-client and fish)
BuildArch: noarch
Obsoletes: kubernetes-client-fish-completion
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}.
Fish command line completion support for %{name}-client.
%prep
%setup -q -n kubernetes-%{version}