Cleanup some new profiles.

apparmor.d/groups/gnome/evolution-alarm-notify

@@ -9,22 +9,13 @@ include <tunables/global>
 @{exec_path} = /{usr/,}lib/evolution-data-server/evolution-alarm-notify
 profile evolution-alarm-notify @{exec_path} {
   include <abstractions/base>
+  include <abstractions/gnome>
   include <abstractions/nameservice-strict>
-  include <abstractions/freedesktop.org>
-  include <abstractions/fontconfig-cache-read>
   include <abstractions/openssl>
-  include <abstractions/fonts>
-  include <abstractions/gtk>
 
   @{exec_path} mr,
   
-  /etc/fonts/{,**} r,
-
-  /usr/share/fonts/{,**} r,
   /usr/share/glib-2.0/schemas/gschemas.compiled r,
-  /usr/share/X11/xkb/**  r,
-
-  owner @{user_config_dirs}/mimeapps.list r,
 
   include <abstractions/dconf>
   owner @{run}/user/[0-9]*/dconf/ rw,

apparmor.d/groups/gnome/gio-launch-desktop

@@ -12,31 +12,22 @@ include <tunables/global>
 @{exec_path} += /{usr/,}lib/@{multiarch}/glib-[0-9]*/gio-launch-desktop
 profile gio-launch-desktop @{exec_path} {
   include <abstractions/base>
-  include <abstractions/consoles>
   include <abstractions/app-launcher-user>
+  include <abstractions/consoles>
+  include <abstractions/freedesktop.org>
   include <abstractions/trash>
 
   @{exec_path} mr,
-  /{usr/,}bin/          r,
-  /{usr/,}bin/[a-z0-9]* rPUx,
 
   # System files
   /etc/gnome/defaults.list r,
-  /usr/share/mime/* r,
-  /usr/share/{,*/}applications/{,**} r,
   /var/cache/gio-[0-9]*.[0-9]*/gnome-mimeapps.list r,
 
   # User files
-  owner @{user_config_dirs}/mimeapps.list r,
-  owner @{user_share_dirs}/applications/{,*.desktop} r,
   owner @{PROC}/@{pid}/fd/ r,
 
   # file_inherit
   owner @{HOME}/.xsession-errors w,
-  owner @{user_share_dirs}/mime/{subclasses,icons,generic-icons} r,
-  owner @{user_share_dirs}/mime/{mime.cache,aliases,magic} r,
-  owner @{user_share_dirs}/mime/globs* r,
-  owner @{user_share_dirs}/applications/{mimeapps.list,mimeinfo.cache} r,
 
   # Required by many gio command
   owner @{HOME}/{,**} rw,

apparmor.d/groups/gnome/gjs-console

@@ -9,17 +9,17 @@ include <tunables/global>
 @{exec_path}  = /{usr/,}bin/gjs-console
 profile gjs-console @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/openssl>
-  include <abstractions/gtk>
   include <abstractions/fonts>
   include <abstractions/freedesktop.org>
+  include <abstractions/gtk>
+  include <abstractions/openssl>
 
   network netlink raw,
 
   @{exec_path} mr,
   /{usr/,}bin/          r,
-  /{usr/,}bin/[a-z0-9]* rPix,
-  /usr/{lib,libexec}/** rPix,
+  /{usr/,}bin/[a-z0-9]* rPUx,
+  /usr/{lib,libexec}/** rPUx,
 
   /usr/share/dconf/profile/gdm r,
   /usr/share/gdm/greeter-dconf-defaults r,

apparmor.d/groups/gnome/gnome-calendar

@@ -9,29 +9,23 @@ include <tunables/global>
 @{exec_path} = /{usr/,}bin/gnome-calendar
 profile gnome-calendar @{exec_path} {
   include <abstractions/base>
-  include <abstractions/fonts>
+  include <abstractions/gnome>
   include <abstractions/nameservice-strict>
-  include <abstractions/ssl_certs>
   include <abstractions/openssl>
-  include <abstractions/fonts>
-  include <abstractions/gtk>
+  include <abstractions/ssl_certs>
 
   network netlink raw,
 
   @{exec_path} mr,
 
+  /usr/share/libgweather/Locations.xml r,
   /usr/share/glib-2.0/schemas/gschemas.compiled r,
-  /usr/share/icons/{,**} r,
-  /usr/share/X11/xkb/{,**} r,
-
-  owner @{user_share_dirs}/recently-used.xbel r,
-  owner @{user_config_dirs}/user-dirs.dirs r,
 
   include <abstractions/dconf>
   owner @{run}/user/[0-9]*/dconf/ rw,
   owner @{run}/user/[0-9]*/dconf/user rw,
 
-  /run/user/1000/gdm/Xauthority r,
+  owner @{run}/user/[0-9]*/gdm/Xauthority r,
 
   include if exists <local/gnome-calendar>
 }

apparmor.d/groups/gnome/gnome-contacts

@@ -9,9 +9,12 @@ include <tunables/global>
 @{exec_path} = /{usr/,}bin/gnome-contacts
 profile gnome-contacts @{exec_path} {
   include <abstractions/base>
+  include <abstractions/dri-common>
+  include <abstractions/dri-enumerate>
+  include <abstractions/gnome>
   include <abstractions/nameservice-strict>
+  include <abstractions/openssl>
   include <abstractions/ssl_certs>
-  include <abstractions/gtk>
 
   network netlink raw,
 
@@ -20,7 +23,6 @@ profile gnome-contacts @{exec_path} {
   /usr/share/glib-2.0/schemas/gschemas.compiled r,
 
   owner @{user_share_dirs}/folks/relationships.ini r,
-  /dev/dri/ r,
 
   include <abstractions/dconf>
   owner @{run}/user/[0-9]*/dconf/ rw,

apparmor.d/groups/gnome/goa-daemon

@@ -10,9 +10,9 @@ include <tunables/global>
 profile goa-daemon @{exec_path} {
   include <abstractions/base>
   include <abstractions/nameservice-strict>
-  include <abstractions/ssl_certs>
-  include <abstractions/p11-kit>
   include <abstractions/openssl>
+  include <abstractions/p11-kit>
+  include <abstractions/ssl_certs>
 
   network inet stream,
   network inet6 stream,

apparmor.d/groups/gnome/seahorse

@@ -9,9 +9,9 @@ include <tunables/global>
 @{exec_path} = /{usr/,}bin/seahorse
 profile seahorse @{exec_path} {
   include <abstractions/base>
-  include <abstractions/ssl_certs>
+  include <abstractions/gnome>
   include <abstractions/p11-kit>
-  include <abstractions/gtk>
+  include <abstractions/ssl_certs>
 
   @{exec_path} mr,
 
@@ -20,8 +20,6 @@ profile seahorse @{exec_path} {
   /{usr/,}bin/gpgsm    rPx,
 
   /usr/share/glib-2.0/schemas/gschemas.compiled r,
-  /usr/share/icons/{,**} r,
-  /usr/share/X11/xkb/**  r,
   
   # Seahorse and SSH keys
   owner @{HOME}/@{XDG_SSH_DIR}/{,**} r,