From 7314b9e32702b4b8752434534a696bcd87855fccc0b4c3adc5f0fc50a802c07e Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Sat, 11 Feb 2017 12:19:17 +0000
Subject: [PATCH 1/3] Accepting request 456389 from
 home:jengelh:branches:security:apparmor

- Fix RPM groups

OBS-URL: https://build.opensuse.org/request/show/456389
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=168
---
 libapparmor.changes | 5 +++++
 libapparmor.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libapparmor.changes b/libapparmor.changes
index 30f7b23..22cb804 100644
--- a/libapparmor.changes
+++ b/libapparmor.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Feb 11 11:33:16 UTC 2017 - jengelh@inai.de
+
+- Fix RPM groups
+
 -------------------------------------------------------------------
 Sat Jan 28 21:40:11 UTC 2017 - suse-beta@cboltz.de
 
diff --git a/libapparmor.spec b/libapparmor.spec
index 79179a2..a99bf9c 100644
--- a/libapparmor.spec
+++ b/libapparmor.spec
@@ -40,7 +40,7 @@ well as functions to parse AppArmor log messages.
 
 %package -n libapparmor1
 Summary:        Utility library for AppArmor
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 %ifarch ppc64
 Obsoletes:      libapparmor-64bit < 2.9
 Provides:       libapparmor-64bit = %{version}

From 14d5404240e844c1e8493915d5cee5ed3d132a8c8e46103bdd613ae01e515d83 Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Sat, 18 Feb 2017 12:29:18 +0000
Subject: [PATCH 2/3] Accepting request 458503 from
 home:matejcik:branches:security:apparmor

- add python3-drop-re-locale.patch: remove deprecated re.LOCALE
  flag in Python UI as it was dropped from Python 3.6

OBS-URL: https://build.opensuse.org/request/show/458503
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=169
---
 apparmor.changes             |  6 ++++++
 apparmor.spec                |  6 ++++++
 python3-drop-re-locale.patch | 15 +++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 python3-drop-re-locale.patch

diff --git a/apparmor.changes b/apparmor.changes
index 522a739..4cae9a4 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 16 14:08:55 UTC 2017 - jmatejek@suse.com
+
+- add python3-drop-re-locale.patch: remove deprecated re.LOCALE
+  flag in Python UI as it was dropped from Python 3.6
+
 -------------------------------------------------------------------
 Mon Jan 30 21:37:48 UTC 2017 - suse-beta@cboltz.de
 
diff --git a/apparmor.spec b/apparmor.spec
index 3a9d8d5..82b0446 100644
--- a/apparmor.spec
+++ b/apparmor.spec
@@ -85,6 +85,9 @@ Patch8:         sshd-profile-drop-local-include-r3615.diff
 # upstream changes (trunk r3616..3628)
 Patch9:         upstream-changes-r3616..3628.diff
 
+# drop deprecated re.LOCALE flag from regexps
+Patch10:        python3-drop-re-locale.patch
+
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{distro} == "suse"
@@ -392,6 +395,9 @@ SubDomain.
 %patch7 -p1
 %patch8
 %patch9
+%if %{with python3}
+%patch10 -p1
+%endif
 
 # search for left-over multiline rules
 test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' profiles/apparmor.d/)"
diff --git a/python3-drop-re-locale.patch b/python3-drop-re-locale.patch
new file mode 100644
index 0000000..f85636a
--- /dev/null
+++ b/python3-drop-re-locale.patch
@@ -0,0 +1,15 @@
+Index: apparmor-2.11.0/utils/apparmor/ui.py
+===================================================================
+--- apparmor-2.11.0.orig/utils/apparmor/ui.py
++++ apparmor-2.11.0/utils/apparmor/ui.py
+@@ -64,8 +64,8 @@ def get_translated_hotkey(translated, cm
+     msg = 'PromptUser: ' + _('Invalid hotkey for')
+ 
+     # Originally (\S) was used but with translations it would not work :(
+-    if re.search('\((\S+)\)', translated, re.LOCALE):
+-        return re.search('\((\S+)\)', translated, re.LOCALE).groups()[0]
++    if re.search('\((\S+)\)', translated):
++        return re.search('\((\S+)\)', translated).groups()[0]
+     else:
+         if cmsg:
+             raise AppArmorException(cmsg)

From b8cc8013180677b3efd1b6359edecf8e62192584d3e3de34d360e15c96a7863e Mon Sep 17 00:00:00 2001
From: Christian Boltz <suse-beta@cboltz.de>
Date: Sat, 18 Feb 2017 12:30:48 +0000
Subject: [PATCH 3/3] add reference to lp#1661766 for
 python3-drop-re-locale.patch

OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=170
---
 apparmor.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apparmor.changes b/apparmor.changes
index 4cae9a4..ca08551 100644
--- a/apparmor.changes
+++ b/apparmor.changes
@@ -2,7 +2,7 @@
 Thu Feb 16 14:08:55 UTC 2017 - jmatejek@suse.com
 
 - add python3-drop-re-locale.patch: remove deprecated re.LOCALE
-  flag in Python UI as it was dropped from Python 3.6
+  flag in Python UI as it was dropped from Python 3.6 (lp#1661766)
 
 -------------------------------------------------------------------
 Mon Jan 30 21:37:48 UTC 2017 - suse-beta@cboltz.de