From 4710d6ccea4085e8c5a9f1f6dc1cdd7b80b5ba78ecee692c6ec4f5eeb640b939 Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Mon, 22 Feb 2021 18:21:51 +0000
Subject: [PATCH] Accepting request 874370 from home:lnussel:usrmove

- avoid file listed twice error

OBS-URL: https://build.opensuse.org/request/show/874370
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=294
---
 apparmor.changes | 5 +++++
 apparmor.spec    | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apparmor.changes b/apparmor.changes
index e2bd6b3..34957fe 100644
--- a/apparmor.changes
+++ b/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>
 
diff --git a/apparmor.spec b/apparmor.spec
index 9088fa2..90140c5 100644
--- a/apparmor.spec
+++ b/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