From 5b9ec4e27e1f1eba468c88cae52d76cc4c5f4d310f0b38b99c0481dd1856d48d Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues Date: Wed, 4 Jan 2023 11:51:42 +0000 Subject: [PATCH] Accepting request 1051011 from home:lnussel:usrmerge - Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1051011 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=358 --- apparmor.changes | 5 +++++ apparmor.spec | 7 ++++--- libapparmor.spec | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apparmor.changes b/apparmor.changes index fd9534c..38bc483 100644 --- a/apparmor.changes +++ b/apparmor.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 27 10:20:43 UTC 2022 - Ludwig Nussel + +- Replace transitional %usrmerged macro with regular version check (boo#1206798) + ------------------------------------------------------------------- Tue Nov 22 18:54:46 UTC 2022 - Christian Boltz diff --git a/apparmor.spec b/apparmor.spec index 8e9bac0..df4a7fa 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -1,7 +1,7 @@ # # spec file for package apparmor # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2011-2022 Christian Boltz # # 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 apparmor_bin_prefix /usr/lib/apparmor %else %define sbindir /sbin +%define apparmor_bin_prefix /lib/apparmor %endif %if 0%{?suse_version} <= 1500 @@ -91,7 +93,6 @@ Patch12: dnsmasq-cpu-possible.diff PreReq: sed BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define apparmor_bin_prefix %{?usrmerged:/usr}/lib/apparmor BuildRequires: bison BuildRequires: dejagnu BuildRequires: flex diff --git a/libapparmor.spec b/libapparmor.spec index 071c1fb..ddab43f 100644 --- a/libapparmor.spec +++ b/libapparmor.spec @@ -1,7 +1,7 @@ # # spec file for package libapparmor # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2011-2022 Christian Boltz # # All modifications and additions to the file contributed by third parties