Accepting request 297855 from home:cboltz

- make sure %service_del_postun doesn't call systemctl try-restart
  (boo#853019, bare systemd edition)
- add samba-4.2-profiles.diff: update samba (winbindd and nmb)
  profiles for samba 4.2 (boo#921098, boo#923201)

OBS-URL: https://build.opensuse.org/request/show/297855
OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=129

apparmor.spec

@@ -103,6 +103,9 @@ Patch8:         apparmor-changes-since-2.9.1.diff
 # fix build with GCC 5 due to bad ostream use
 Patch9:         apparmor-fix-stl-ostream.diff
 
+# update samba (winbindd and nmb) profiles for samba 4.2 (boo#921098, boo#923201)
+Patch10:        samba-4.2-profiles.diff
+
 Url:            https://launchpad.net/apparmor
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -450,6 +453,7 @@ SubDomain.
 %patch7 -p1
 %patch8
 %patch9
+%patch10
 # search for left-over multiline rules
 test -z "$(grep -r '^\s*\(unix\|dbus\)[^,]\(([^)]*)\)*[^,]*$' profiles/apparmor.d/)"
 
@@ -875,6 +879,8 @@ fi
 %endif
 
 %if 0%{?suse_version} > 1320
+# don't call try-restart, see bnc#853019
+export DISABLE_RESTART_ON_UPDATE="yes"
 %service_del_postun apparmor.service
 %endif