From a34acdddfe6f24833cc1aff8a07f16cdc7f28196a27cef321fa0c206535494c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 3 Feb 2016 21:09:03 +0000
Subject: [PATCH] Accepting request 357608 from
 home:cboltz:branches:server:mail

- Move AppArmor profile to /usr/share/apparmor/extra-profiles/, which is
  the directory for inactive profiles since AppArmor 2.9

Please forward this fix to Factory (and 42.1, if you ever have to do an
update for it).


BTW: If you need help with updating the profile (ideally with the goal
to enable it by default), just ask.

OBS-URL: https://build.opensuse.org/request/show/357608
OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=174
---
 exim.changes |  6 ++++++
 exim.spec    | 11 +++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/exim.changes b/exim.changes
index 7e80739..0ec7f50 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  3 19:07:16 UTC 2016 - opensuse@cboltz.de
+
+- Move AppArmor profile to /usr/share/apparmor/extra-profiles/, which is
+  the directory for inactive profiles since AppArmor 2.9
+
 -------------------------------------------------------------------
 Fri Dec 11 10:44:26 UTC 2015 - lmuelle@suse.com
 
diff --git a/exim.spec b/exim.spec
index 67103e8..ea1e9e6 100644
--- a/exim.spec
+++ b/exim.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package exim
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -333,7 +333,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d/
 %endif
 install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir}
 # apparmor profile
-install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/etc/apparmor/profiles/extras/usr.sbin.exim
+install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/usr/share/apparmor/extra-profiles/usr.sbin.exim
 
 %pre
 %if 0%{?suse_version} > 1220
@@ -417,10 +417,9 @@ exit 0
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} < 1000
 %config(noreplace) /etc/permissions.d/exim
 %endif
-%dir /etc/apparmor
-%dir /etc/apparmor/profiles
-%dir /etc/apparmor/profiles/extras
-%config(noreplace) /etc/apparmor/profiles/extras/usr.sbin.exim
+%dir /usr/share/apparmor
+%dir /usr/share/apparmor/extra-profiles
+%config(noreplace) /usr/share/apparmor/extra-profiles/usr.sbin.exim
 /usr/sbin/rcexim
 /usr/bin/mailq
 /usr/bin/runq