Accepting request 874417 from security:apparmor

- avoid file listed twice error (forwarded request 874370 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/874417
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=150

apparmor.changes

@@ -3,6 +3,11 @@ Thu Feb 11 18:18:46 UTC 2021 - Christian Boltz <suse-beta@cboltz.de>
 
 - merge libapparmor.changes into apparmor.changes
 
+-------------------------------------------------------------------
+Mon Feb  8 17:19:19 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
+
+- avoid file listed twice error
+
 -------------------------------------------------------------------
 Tue Feb  2 18:35:17 UTC 2021 - Christian Boltz <suse-beta@cboltz.de>
 

apparmor.spec

@@ -505,9 +505,6 @@ rm -fv %{buildroot}%{_libdir}/libapparmor.la
 %license parser/COPYING.GPL
 %doc parser/README
 %{sbindir}/apparmor_parser
-%if !0%{?usrmerged}
-/sbin/apparmor_parser
-%endif
 %{_bindir}/aa-enabled
 %{_bindir}/aa-exec
 %{_bindir}/aa-features-abi