From 463e94860500edc226fd48f81a0c7ac2e4f332e9a57cc587f7b016511a756f44 Mon Sep 17 00:00:00 2001
From: YaST  Team Bot <yast-internal@suse.de>
Date: Thu, 24 Jan 2019 15:30:50 +0000
Subject: [PATCH] - Adapted aa-status parser to new output format to prevent
 crash   (bsc#1121274) - 4.1.5

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-apparmor?expand=0&rev=213
---
 yast2-apparmor-4.1.4.tar.bz2 | 3 ---
 yast2-apparmor-4.1.5.tar.bz2 | 3 +++
 yast2-apparmor.changes       | 7 +++++++
 yast2-apparmor.spec          | 7 ++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)
 delete mode 100644 yast2-apparmor-4.1.4.tar.bz2
 create mode 100644 yast2-apparmor-4.1.5.tar.bz2

diff --git a/yast2-apparmor-4.1.4.tar.bz2 b/yast2-apparmor-4.1.4.tar.bz2
deleted file mode 100644
index 24677f3..0000000
--- a/yast2-apparmor-4.1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1744373d9203dd2e19238db6f1b28a27edb2140c136d9313765eef3d8d5cff1c
-size 44231
diff --git a/yast2-apparmor-4.1.5.tar.bz2 b/yast2-apparmor-4.1.5.tar.bz2
new file mode 100644
index 0000000..b4f818d
--- /dev/null
+++ b/yast2-apparmor-4.1.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d2d8003aa4756f879415673c4dd78676d48988968aeb501ba44aa5f39bab91a
+size 44785
diff --git a/yast2-apparmor.changes b/yast2-apparmor.changes
index 3455d06..2626522 100644
--- a/yast2-apparmor.changes
+++ b/yast2-apparmor.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 24 12:39:46 UTC 2019 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Adapted aa-status parser to new output format to prevent crash
+  (bsc#1121274)
+- 4.1.5
+
 -------------------------------------------------------------------
 Mon Jan 14 07:41:58 CST 2019 - rgoldwyn@suse.com
 
diff --git a/yast2-apparmor.spec b/yast2-apparmor.spec
index 55ac45b..e133232 100644
--- a/yast2-apparmor.spec
+++ b/yast2-apparmor.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-apparmor
-Version:        4.1.4
+Version:        4.1.5
 Release:        0
 Summary:        YaST2 - Plugins for AppArmor Profile Management
 License:        GPL-2.0-only
@@ -31,6 +31,11 @@ BuildRequires:  yast2-devtools >= 3.1.10
 Requires:       yast2 > 3.3.2
 Requires:       yast2-ruby-bindings >= 1.0.0
 
+# New JSON output format in aa-status; upstream change:
+# aa-status: split profile from exec name
+# bsc#1121274 / PR#35
+Conflicts:      apparmor-utils < 2.13
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch