Accepting request 1066338 from Base:System

- allow to switch off Apparmor support via bcond (forwarded request 1066220 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/1066338
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/psmisc?expand=0&rev=86
This commit is contained in:
Dominique Leuenberger 2023-02-19 17:18:53 +00:00 committed by Git OBS Bridge
commit bff81f8873
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 16 16:06:59 UTC 2023 - Ludwig Nussel <lnussel@suse.de>
- allow to switch off Apparmor support via bcond
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 27 13:15:30 UTC 2022 - Ludwig Nussel <lnussel@suse.com> Tue Dec 27 13:15:30 UTC 2022 - Ludwig Nussel <lnussel@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package psmisc # spec file for package psmisc
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 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,8 @@
# #
%bcond_without apparmor
Name: psmisc Name: psmisc
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -27,7 +29,9 @@ BuildRequires: libselinux-devel
BuildRequires: linux-glibc-devel >= 4.12 BuildRequires: linux-glibc-devel >= 4.12
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: netcat-openbsd BuildRequires: netcat-openbsd
%if %{with apparmor}
BuildRequires: pkgconfig(libapparmor) BuildRequires: pkgconfig(libapparmor)
%endif
URL: https://gitlab.com/psmisc/psmisc/ URL: https://gitlab.com/psmisc/psmisc/
Version: 23.6 Version: 23.6
Release: 0 Release: 0
@ -74,7 +78,7 @@ CC=gcc
export CFLAGS CXXFLAGS LDFLAGS CC export CFLAGS CXXFLAGS LDFLAGS CC
%configure --disable-rpath \ %configure --disable-rpath \
--with-gnu-ld \ --with-gnu-ld \
--enable-apparmor \ %{?with_apparmor:--enable-apparmor} \
--enable-selinux --enable-selinux
make %{?_smp_mflags} CFLAGS="$CFLAGS" "CC=$CC" make %{?_smp_mflags} CFLAGS="$CFLAGS" "CC=$CC"