From df353f7598a67cf35bfecc8f5e86264e397d26cada971b676ad39c962c9643ec Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 13 Jun 2024 11:30:17 +0000 Subject: [PATCH] Accepting request 1180396 from home:ldragon:branches:systemsmanagement:cockpit - disable selinux on leap versions without selinux - set libexec dir to %_libexecdir (bsc#1223533) OBS-URL: https://build.opensuse.org/request/show/1180396 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=180 --- cockpit.changes | 6 ++++++ cockpit.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cockpit.changes b/cockpit.changes index 245c44d..5dbf0f3 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 13 11:02:10 UTC 2024 - Luna D Dragon + +- disable selinux on leap versions without selinux +- set libexec dir to %_libexecdir (bsc#1223533) + ------------------------------------------------------------------- Thu May 16 08:12:47 UTC 2024 - Luna D Dragon diff --git a/cockpit.spec b/cockpit.spec index 6f189cf..38f55d3 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -101,11 +101,14 @@ Patch104: selinux_libdir.patch %define build_pcp 0 %endif %endif - +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1500 # Ship custom SELinux policy %define selinuxtype targeted %define selinux_configure_arg --enable-selinux-policy=%{selinuxtype} %define with_selinux 1 +%else +%define selinux_configure_arg --enable-selinux-policy=no +%endif BuildRequires: gcc BuildRequires: pkgconfig(gio-unix-2.0) @@ -246,6 +249,7 @@ autoreconf -fvi -I tools --with-cockpit-ws-instance-user=cockpit-wsinstance \ %if 0%{?suse_version} --docdir=%_defaultdocdir/%{name} \ + --libexecdir=%_libexecdir \ %endif --with-pamdir='%{pamdir}' \ %if %{build_pcp} == 0