[nautilus/sam/tracker-3: 1/2] flatpak: Update permissions for Tracker 3

[Sam Thursfield <sthursfield src gnome org>]

commit bbdb4f2e6163f8729f68766e66adad9d2a45389a
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Aug 1 18:40:25 2020 +0200

    flatpak: Update permissions for Tracker 3

 build-aux/flatpak/org.gnome.Nautilus.json      |  9 ++++-----
 build-aux/flatpak/org.gnome.Nautilus.yml       | 10 +++++-----
 build-aux/flatpak/org.gnome.NautilusMaster.yml | 10 +++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index ea2aa553a..8956d6b68 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -14,8 +14,6 @@
     "--socket=x11",
     "--socket=wayland",
     "--talk-name=org.gnome.OnlineAccounts",
-    "--talk-name=org.freedesktop.Tracker3.Miner.Files",
-    "--talk-name=org.freedesktop.Tracker3.Miner.Extract",
     "--filesystem=host",
     "--talk-name=org.gtk.vfs",
     "--talk-name=org.gtk.vfs.*",
@@ -24,7 +22,7 @@
     "--filesystem=~/.config/dconf:ro",
     "--talk-name=ca.desrt.dconf",
     "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
-    "--env=TRACKER_SPARQL_BACKEND=bus"
+    "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:FileSystem;tracker:Documents"
   ],
   "modules": [
     {
@@ -63,9 +61,10 @@
       "buildsystem": "meson",
       "cleanup": [
         "/etc",
-        "/lib",
         "/libexec/tracker-3",
-        "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service"
+        "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service",
+        "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service",
+        "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service"
       ],
       "config-opts": [
         "-Dextract=true",
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 93a098db0..7add949f5 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -13,8 +13,6 @@ finish-args:
 - "--socket=x11"
 - "--socket=wayland"
 - "--talk-name=org.gnome.OnlineAccounts"
-- "--talk-name=org.freedesktop.Tracker3.Miner.Files"
-- "--talk-name=org.freedesktop.Tracker3.Miner.Extract"
 - "--filesystem=host"
 - "--talk-name=org.gtk.vfs"
 - "--talk-name=org.gtk.vfs.*"
@@ -23,7 +21,8 @@ finish-args:
 - "--filesystem=~/.config/dconf:ro"
 - "--talk-name=ca.desrt.dconf"
 - "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-- "--env=TRACKER_SPARQL_BACKEND=bus"
+# Access to host Tracker Miners
+- "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:FileSystem;tracker:Documents"
 modules:
 - name: exiv2
   config-opts:
@@ -48,9 +47,10 @@ modules:
   buildsystem: meson
   cleanup:
   - "/etc"
-  - "/lib"
   - "/libexec/tracker-3"
-  - "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service"
+  - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service"
+  - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service"
+  - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service"
   config-opts:
   - "-Dextract=true"
   - "-Dgeneric_media_extractor=none"
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index 8215d3dec..b467e6c40 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -13,8 +13,6 @@ finish-args:
 - "--socket=x11"
 - "--socket=wayland"
 - "--talk-name=org.gnome.OnlineAccounts"
-- "--talk-name=org.freedesktop.Tracker3.Miner.Files"
-- "--talk-name=org.freedesktop.Tracker3.Miner.Extract"
 - "--filesystem=host"
 - "--talk-name=org.gtk.vfs"
 - "--talk-name=org.gtk.vfs.*"
@@ -23,7 +21,8 @@ finish-args:
 - "--filesystem=~/.config/dconf:ro"
 - "--talk-name=ca.desrt.dconf"
 - "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-- "--env=TRACKER_SPARQL_BACKEND=bus"
+# Access to host Tracker Miners
+- "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:FileSystem;tracker:Documents"
 modules:
 - name: exiv2
   config-opts:
@@ -47,9 +46,10 @@ modules:
   buildsystem: meson
   cleanup:
   - "/etc"
-  - "/lib"
   - "/libexec/tracker-3"
-  - "/share/dbus-1/services/org.freedesktop.Tracker3.Writeback.service"
+  - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service"
+  - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service"
+  - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service"
   config-opts:
   - "-Dextract=true"
   - "-Dgeneric_media_extractor=none"