From 880c613b472a91a3fdf7c3ce2966b9cea46df8d4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 5 Oct 2018 15:03:07 -0400
Subject: [PATCH] Remove the dbus service conf

This has been superseded by the environment generator.

Closes: #2122
Approved by: matthiasclasen
---
 Makefile.am                    | 9 ---------
 dbus.service.d/flatpak.conf.in | 2 --
 2 files changed, 11 deletions(-)
 delete mode 100644 dbus.service.d/flatpak.conf.in

diff --git a/Makefile.am b/Makefile.am
index 8d16ceb3..a41e57d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,15 +162,6 @@ flatpak.env: env.d/flatpak.env.in
 envgendir = $(systemduserenvgendir)
 envgen_DATA = env.d/60-flatpak
 
-dbussnippetdir = $(systemduserunitdir)/dbus.service.d
-dbussnippet_DATA = flatpak.conf
-EXTRA_DIST += dbus.service.d/flatpak.conf.in
-DISTCLEANFILES += flatpak.conf
-
-flatpak.conf: dbus.service.d/flatpak.conf.in
-	$(AM_V_GEN) $(SED) -e "s|\@localstatedir\@|$(localstatedir)|" \
-		-e "s|\@sysconfdir\@|$(sysconfdir)|" $< > $@
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = flatpak.pc
 EXTRA_DIST += flatpak.pc.in
diff --git a/dbus.service.d/flatpak.conf.in b/dbus.service.d/flatpak.conf.in
deleted file mode 100644
index fdcacd6a..00000000
--- a/dbus.service.d/flatpak.conf.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment=XDG_DATA_DIRS=%h/.local/share/flatpak/exports/share/:@localstatedir@/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/