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

@@ -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>
 

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

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