pool/cockpit
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1104348 from home:djz88:branches:systemsmanagement:cockpit

Browse Source 
- 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
This commit is contained in:
Jan Zerebecki 2023-08-18 12:07:29 +00:00 committed by Git OBS Bridge
parent 249929fe5a
commit be0f315151
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cockpit.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 15 13:53:14 UTC 2023 - Zdenek Kubala <zkubala@suse.cz>
- 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 <adam.majer@suse.de> Thu Aug 3 11:35:47 UTC 2023 - Adam Majer <adam.majer@suse.de>

7
cockpit.spec
View File

@ -231,8 +231,11 @@ BuildRequires: python3-tox-current-env
# SLE Micro specific patches # SLE Micro specific patches
%if 0%{?is_smo} %if 0%{?is_smo}
%patch101 -p1 %patch101 -p1
# Patches for versions lower then SLE Micro 5.5
%if 0%{?sle_version} < 150500
%patch102 -p1 %patch102 -p1
%endif %endif
%endif
# For anything based on SLES 15 codebase (including Leap, SLEM) # For anything based on SLES 15 codebase (including Leap, SLEM)
%if 0%{?suse_version} == 1500 %if 0%{?suse_version} == 1500
%patch103 -p1 %patch103 -p1
@ -774,8 +777,8 @@ Summary: Cockpit SELinux package
Requires: cockpit-bridge >= %{required_base} Requires: cockpit-bridge >= %{required_base}
Requires: cockpit-shell >= %{required_base} Requires: cockpit-shell >= %{required_base}
Requires: policycoreutils-python-utils >= 3.1 Requires: policycoreutils-python-utils >= 3.1
# setroubleshoot not yet in SLE Micro # setroubleshoot is available on SLE Micro starting with 5.5)
%if !0%{?is_smo} %if !0%{?is_smo} || ( 0%{?is_smo} && 0%{?sle_version} >= 150500 )
Requires: setroubleshoot-server >= 3.3.3 Requires: setroubleshoot-server >= 3.3.3
%endif %endif
BuildArch: noarch BuildArch: noarch