pool/apparmor
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1055771 from security:apparmor

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1055771
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=185
This commit is contained in:
Dominique Leuenberger 2023-01-05 14:00:02 +00:00 committed by Git OBS Bridge
commit 21b2d6d319
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apparmor.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 27 10:20:43 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 22 18:54:46 UTC 2022 - Christian Boltz <suse-beta@cboltz.de> Tue Nov 22 18:54:46 UTC 2022 - Christian Boltz <suse-beta@cboltz.de>

7
apparmor.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package apparmor # spec file for package apparmor
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# Copyright (c) 2011-2022 Christian Boltz # Copyright (c) 2011-2022 Christian Boltz
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -17,10 +17,12 @@
# #
%if 0%{?usrmerged} %if 0%{?suse_version} >= 1550
%define sbindir %_sbindir %define sbindir %_sbindir
%define apparmor_bin_prefix /usr/lib/apparmor
%else %else
%define sbindir /sbin %define sbindir /sbin
%define apparmor_bin_prefix /lib/apparmor
%endif %endif
%if 0%{?suse_version} <= 1500 %if 0%{?suse_version} <= 1500
@ -91,7 +93,6 @@ Patch12: dnsmasq-cpu-possible.diff
PreReq: sed PreReq: sed
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor
BuildRequires: bison BuildRequires: bison
BuildRequires: dejagnu BuildRequires: dejagnu
BuildRequires: flex BuildRequires: flex

2
libapparmor.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libapparmor # spec file for package libapparmor
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# Copyright (c) 2011-2022 Christian Boltz # Copyright (c) 2011-2022 Christian Boltz
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties