Move D-Bus conf file to $(datadir)/dbus-1/system.d

Since D-Bus 1.9.18 configuration files installed by third-party should go in share/dbus-1/system.d. The old location is for sysadmin overrides. Closes: coreos#1903 Approved by: jlebon
jlebon · Sep 17, 2019 · a8ee788 · a8ee788
1 parent 13377d4
commit a8ee788
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile-daemon.am b/Makefile-daemon.am
@@ -71,7 +71,7 @@ librpmostreed_la_LIBADD = \
 	$(NULL)
 
 dbusconf_DATA = $(srcdir)/src/daemon/org.projectatomic.rpmostree1.conf
-dbusconfdir = ${sysconfdir}/dbus-1/system.d
+dbusconfdir = $(datadir)/dbus-1/system.d
 
 systemdunit_service_in_files = \
 	$(srcdir)/src/daemon/rpm-ostreed.service.in \

diff --git a/packaging/rpm-ostree.spec.in b/packaging/rpm-ostree.spec.in
@@ -151,7 +151,7 @@ $PYTHON autofiles.py > files \
   '%{_bindir}/*' \
   '%{_libdir}/%{name}' \
   '%{_mandir}/man*/*' \
-  '%{_sysconfdir}/dbus-1/system.d/*' \
+  '%{_datadir}/dbus-1/system.d/*' \
   '%{_sysconfdir}/rpm-ostreed.conf' \
   '%{_prefix}/lib/systemd/system/*' \
   '%{_libexecdir}/rpm-ostree*' \