abrooks/cockpit
SHA256
1
0
Fork 0
forked from cockpit/cockpit
Code Pull Requests Activity

Accepting request 1180404 from systemsmanagement:cockpit

Browse Source 
- disable selinux on leap versions without selinux
- set libexec dir to %_libexecdir (bsc#1223533)

OBS-URL: https://build.opensuse.org/request/show/1180404
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=45
This commit is contained in:
Ana Guerrero 2024-06-14 16:57:15 +00:00 committed by Git OBS Bridge
commit 741d9db1a6
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cockpit.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 13 11:02:10 UTC 2024 - Luna D Dragon <luna.dragon@suse.com>
- 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 <luna.dragon@suse.com> Thu May 16 08:12:47 UTC 2024 - Luna D Dragon <luna.dragon@suse.com>

6
cockpit.spec
View File

@ -101,11 +101,14 @@ Patch104: selinux_libdir.patch
%define build_pcp 0 %define build_pcp 0
%endif %endif
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1500
# Ship custom SELinux policy # Ship custom SELinux policy
%define selinuxtype targeted %define selinuxtype targeted
%define selinux_configure_arg --enable-selinux-policy=%{selinuxtype} %define selinux_configure_arg --enable-selinux-policy=%{selinuxtype}
%define with_selinux 1 %define with_selinux 1
%else
%define selinux_configure_arg --enable-selinux-policy=no
%endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gio-unix-2.0)
@ -246,6 +249,7 @@ autoreconf -fvi -I tools
--with-cockpit-ws-instance-user=cockpit-wsinstance \ --with-cockpit-ws-instance-user=cockpit-wsinstance \
%if 0%{?suse_version} %if 0%{?suse_version}
--docdir=%_defaultdocdir/%{name} \ --docdir=%_defaultdocdir/%{name} \
--libexecdir=%_libexecdir \
%endif %endif
--with-pamdir='%{pamdir}' \ --with-pamdir='%{pamdir}' \
%if %{build_pcp} == 0 %if %{build_pcp} == 0