Accepting request 88695 from security:apparmor:factory

- include autogenerated profile sniplet for samba shares (bnc#688040)
- more helpful error message for "aa-notify -p" if the user is not in
  the configured group

OBS-URL: https://build.opensuse.org/request/show/88695
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apparmor?expand=0&rev=26

apparmor.spec

@@ -53,9 +53,15 @@ Source1:        %{name}-profile-editor.png
 Source2:        %{name}-profile-editor.desktop
 Source3:        update-trans.sh
 
+# more helpful error message for "aa-notify -p" if the user is not in the configured group. Patch pending upstream.
+Patch:          apparmor-2.7.0rc1-aa-notify-better-error-message.diff
+
 # enable caching of profiles (= massive performance speedup when loading profiles)
 Patch1:         apparmor-enable-profile-cache.diff
 
+# include autogenerated profile sniplet for samba shares (bnc#688040)
+Patch2:         apparmor-samba-include-permissions-for-shares.diff
+
 # split a long string in AppArmor.pm. Not accepted upstream because they want a solution without hardcoded width.
 Patch5:         apparmor-utils-string-split
 
@@ -400,7 +406,9 @@ SubDomain.
 
 %prep
 %setup -q -n %{name}-%{versiondir}
+%patch -p0
 %patch1 -p1
+%patch2 -p0
 %patch5 -p1
 #%patch10 -p1 # disabled, see above
 #%patch11 -p1 # disabled, see above