From be0f315151a849caa3f5b5c6e5f0192f2cafb92a7adea7269bc90c785bd33dbf Mon Sep 17 00:00:00 2001 From: Jan Zerebecki Date: Fri, 18 Aug 2023 12:07:29 +0000 Subject: [PATCH] Accepting request 1104348 from home:djz88:branches:systemsmanagement:cockpit - set setroubleshoot-server dependency and do not apply 0002-selinux-temporary-remove-setroubleshoot-section-patch for cockpit-selinux when build for SLE Micro 5.5 OBS-URL: https://build.opensuse.org/request/show/1104348 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=137 --- cockpit.changes | 7 +++++++ cockpit.spec | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cockpit.changes b/cockpit.changes index dd4ac6d..07e742b 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 15 13:53:14 UTC 2023 - Zdenek Kubala + +- set setroubleshoot-server dependency and do not apply + 0002-selinux-temporary-remove-setroubleshoot-section-patch for + cockpit-selinux when build for SLE Micro 5.5 + ------------------------------------------------------------------- Thu Aug 3 11:35:47 UTC 2023 - Adam Majer diff --git a/cockpit.spec b/cockpit.spec index 8e44845..ba97b8d 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -231,8 +231,11 @@ BuildRequires: python3-tox-current-env # SLE Micro specific patches %if 0%{?is_smo} %patch101 -p1 +# Patches for versions lower then SLE Micro 5.5 +%if 0%{?sle_version} < 150500 %patch102 -p1 %endif +%endif # For anything based on SLES 15 codebase (including Leap, SLEM) %if 0%{?suse_version} == 1500 %patch103 -p1 @@ -774,8 +777,8 @@ Summary: Cockpit SELinux package Requires: cockpit-bridge >= %{required_base} Requires: cockpit-shell >= %{required_base} Requires: policycoreutils-python-utils >= 3.1 -# setroubleshoot not yet in SLE Micro -%if !0%{?is_smo} +# setroubleshoot is available on SLE Micro starting with 5.5) +%if !0%{?is_smo} || ( 0%{?is_smo} && 0%{?sle_version} >= 150500 ) Requires: setroubleshoot-server >= 3.3.3 %endif BuildArch: noarch