Dominique Leuenberger 2024-01-03 13:53:57 +00:00 committed by Git OBS Bridge
commit 9f110f9bea
2 changed files with 29 additions and 15 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 3 09:54:01 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Set ExclusiveArch conditionally depending on the distro
- Remove SLE15 SP4 from the distro check (end of general support)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 21 17:52:42 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com> Tue Nov 21 17:52:42 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package containerized-data-importer # spec file for package containerized-data-importer
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,6 +16,19 @@
# #
%if 0%{?sle_version} && !0%{?is_opensuse}
# SLE
%define _exclusive_arch x86_64
%else
%if 0%{?suse_version} == 1600
# ALP
%define _exclusive_arch x86_64
%else
# TW
%define _exclusive_arch x86_64 aarch64
%endif
%endif
Name: containerized-data-importer Name: containerized-data-importer
Version: 1.58.0 Version: 1.58.0
Release: 0 Release: 0
@ -33,7 +46,7 @@ BuildRequires: pkgconfig
BuildRequires: rsync BuildRequires: rsync
BuildRequires: sed BuildRequires: sed
BuildRequires: golang(API) >= 1.20 BuildRequires: golang(API) >= 1.20
ExclusiveArch: x86_64 aarch64 ExclusiveArch: %{_exclusive_arch}
%description %description
Containerized-Data-Importer (CDI) is a persistent storage management add-on for Kubernetes Containerized-Data-Importer (CDI) is a persistent storage management add-on for Kubernetes
@ -137,11 +150,6 @@ tar --strip-components=1 -xf %{S:0}
# #
distro='%{?sle_version}:%{?is_opensuse}%{!?is_opensuse:0}' distro='%{?sle_version}:%{?is_opensuse}%{!?is_opensuse:0}'
case "${distro}" in case "${distro}" in
150400:0)
tagprefix=suse/sles/15.4
labelprefix=com.suse.kubevirt
registry=registry.suse.com
;;
150500:0) 150500:0)
tagprefix=suse/sles/15.5 tagprefix=suse/sles/15.5
labelprefix=com.suse.kubevirt labelprefix=com.suse.kubevirt
@ -158,14 +166,14 @@ case "${distro}" in
registry=registry.opensuse.org registry=registry.opensuse.org
;; ;;
*) *)
%if 0%{?suse_version} == 1600 %if 0%{?suse_version} == 1600
tagprefix=alp/kubevirt tagprefix=alp/kubevirt
labelprefix=com.suse.kubevirt labelprefix=com.suse.kubevirt
registry=registry.suse.com registry=registry.suse.com
%else %else
echo "Unsupported distro: ${distro}" >&2 echo "Unsupported distro: ${distro}" >&2
exit 1 exit 1
%endif %endif
;; ;;
esac esac