From d98e022ecf72b2ae37eecde18f4e5598b48d4358c4c157c76918580822d167f5 Mon Sep 17 00:00:00 2001
From: Peter Poeml <poeml@cmdline.net>
Date: Thu, 23 Aug 2007 11:23:36 +0000
Subject: [PATCH] do not install apparmor profile by default

OBS-URL: https://build.opensuse.org/package/show/server:mail/exim?expand=0&rev=65
---
 apparmor.usr.sbin.exim | 2 +-
 exim.changes           | 5 +++++
 exim.spec              | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apparmor.usr.sbin.exim b/apparmor.usr.sbin.exim
index f78b75e..76d93d1 100644
--- a/apparmor.usr.sbin.exim
+++ b/apparmor.usr.sbin.exim
@@ -2,7 +2,7 @@
 # Last Modified: Wed May 30 17:00:04 2007
 #include <tunables/global>
 
-/usr/sbin/exim flags=(complain) {
+/usr/sbin/exim {
   #include <abstractions/base>
   #include <abstractions/nameservice>
   #include <abstractions/user-mail>
diff --git a/exim.changes b/exim.changes
index 8a8d632..db2be24 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 23 13:19:32 CEST 2007 - poeml@suse.de
+
+- do not install apparmor profile by default [#285727]
+
 -------------------------------------------------------------------
 Fri Jul 13 13:44:42 CEST 2007 - poeml@suse.de
 
diff --git a/exim.spec b/exim.spec
index 3acb081..de38373 100644
--- a/exim.spec
+++ b/exim.spec
@@ -309,7 +309,7 @@ cp -p $RPM_SOURCE_DIR/eximstats.conf $RPM_BUILD_ROOT/etc/apache2/conf.d/
 install -m 0755 $RPM_SOURCE_DIR/eximstats-html-update.py $RPM_BUILD_ROOT/%{_sbindir}
 %endif
 # apparmor profile
-install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/etc/apparmor.d/usr.sbin.exim
+install -D -m 0644 $RPM_SOURCE_DIR/apparmor.usr.sbin.exim $RPM_BUILD_ROOT/etc/apparmor/profiles/extras/usr.sbin.exim
  
 %post
 %run_permissions
@@ -369,8 +369,8 @@ exit 0
 %if %{?suse_version:%suse_version}%{?!suse_version:99999} < 1000
 %config(noreplace) /etc/permissions.d/exim
 %endif
-%dir /etc/apparmor.d
-%config(noreplace) /etc/apparmor.d/usr.sbin.exim
+%dir /etc/apparmor/profiles/extras
+%config(noreplace) /etc/apparmor/profiles/extras/usr.sbin.exim
 /usr/sbin/rcexim
 /usr/bin/mailq
 /usr/bin/runq