Skip to content

Commit

Permalink
settings-defaults: provide defaults for FIPS variants
Browse files Browse the repository at this point in the history 
Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
  • Loading branch information
@arnaldo2792
arnaldo2792 committed Oct 30, 2024
1 parent 1206d6e commit 2ee4755
Showing 1 changed file with 32 additions and 12 deletions.
44 changes: 32 additions & 12 deletions packages/settings-defaults/settings-defaults.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,14 @@ Conflicts: %{_cross_os}settings-defaults(any)
%{summary}.

%package aws-ecs-2
Summary: Settings defaults for the aws-ecs-2 variant
Requires: %{_cross_os}variant(aws-ecs-2)
Summary: Settings defaults for the aws-ecs-2 FIPS and non-FIPS variants
Requires: (%{shrink:
%{_cross_os}variant(aws-ecs-2) or
%{_cross_os}variant(aws-ecs-2-fips)
%{nil}})
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(aws-ecs-2)
Provides: %{_cross_os}settings-defaults(aws-ecs-2-fips)
Conflicts: %{_cross_os}settings-defaults(any)

%description aws-ecs-2
Expand Down Expand Up @@ -130,18 +134,26 @@ Conflicts: %{_cross_os}settings-defaults(any)
%package aws-k8s-1.31
Summary: Settings defaults for the aws-k8s 1.27 through 1.30 variants
Requires: (%{shrink:
%{_cross_os}variant(aws-k8s-1.27) or
%{_cross_os}variant(aws-k8s-1.28) or
%{_cross_os}variant(aws-k8s-1.29) or
%{_cross_os}variant(aws-k8s-1.30) or
%{_cross_os}variant(aws-k8s-1.31)
%{_cross_os}variant(aws-k8s-1.27) or
%{_cross_os}variant(aws-k8s-1.28) or
%{_cross_os}variant(aws-k8s-1.28-fips) or
%{_cross_os}variant(aws-k8s-1.29) or
%{_cross_os}variant(aws-k8s-1.29-fips) or
%{_cross_os}variant(aws-k8s-1.30) or
%{_cross_os}variant(aws-k8s-1.30-fips) or
%{_cross_os}variant(aws-k8s-1.31) or
%{_cross_os}variant(aws-k8s-1.31-fips)
%{nil}})
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.27)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.28)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.28-fips)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.29)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.29-fips)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.30)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.30-fips)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.31)
Provides: %{_cross_os}settings-defaults(aws-k8s-1.31-fips)
Conflicts: %{_cross_os}settings-defaults(any)

%description aws-k8s-1.31
Expand Down Expand Up @@ -208,18 +220,26 @@ Conflicts: %{_cross_os}settings-defaults(any)
%package vmware-k8s-1.31
Summary: Settings defaults for the vmware-k8s 1.27 through 1.30 variants
Requires: (%{shrink:
%{_cross_os}variant(vmware-k8s-1.27) or
%{_cross_os}variant(vmware-k8s-1.28) or
%{_cross_os}variant(vmware-k8s-1.29) or
%{_cross_os}variant(vmware-k8s-1.30) or
%{_cross_os}variant(vmware-k8s-1.31)
%{_cross_os}variant(vmware-k8s-1.27) or
%{_cross_os}variant(vmware-k8s-1.28) or
%{_cross_os}variant(vmware-k8s-1.28-fips) or
%{_cross_os}variant(vmware-k8s-1.29) or
%{_cross_os}variant(vmware-k8s-1.29-fips) or
%{_cross_os}variant(vmware-k8s-1.30) or
%{_cross_os}variant(vmware-k8s-1.30-fips) or
%{_cross_os}variant(vmware-k8s-1.31) or
%{_cross_os}variant(vmware-k8s-1.31-fips)
%{nil}})
Provides: %{_cross_os}settings-defaults(any)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.27)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.28)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.28-fips)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.29)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.29-fips)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.30)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.30-fips)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.31)
Provides: %{_cross_os}settings-defaults(vmware-k8s-1.31-fips)
Conflicts: %{_cross_os}settings-defaults(any)

%description vmware-k8s-1.31
Expand Down

0 comments on commit 2ee4755

Please sign in to comment.