From 55ab91be8bd3af2a48bd795c62cfb50f9a20cd93 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Feb 19 2018 15:56:00 +0000
Subject: Add systemd dbs for distro, site, and machine local dconf databases


Resolves: #1546644

---

diff --git a/dconf.spec b/dconf.spec
index 2e349ff..2e06eb8 100644
--- a/dconf.spec
+++ b/dconf.spec
@@ -3,7 +3,7 @@
 
 Name:           dconf
 Version:        0.26.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A configuration system
 
 Group:          System Environment/Base
@@ -43,9 +43,19 @@ make V=1 %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-#we need this beacuse ibus and gdm installs file there
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile
+
+cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/dconf/profile/user
+user-db:user
+system-db:local
+system-db:site
+system-db:distro
+EOF
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/local.d/locks
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/site.d/locks
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dconf/db/distro.d/locks
 
 %post
 /sbin/ldconfig
@@ -59,6 +69,7 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %posttrans
+dconf update
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
@@ -66,6 +77,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %license COPYING
 %dir %{_sysconfdir}/dconf
 %dir %{_sysconfdir}/dconf/db
+%dir %{_sysconfdir}/dconf/db/local.d
+%dir %{_sysconfdir}/dconf/db/local.d/locks
+%dir %{_sysconfdir}/dconf/db/site.d
+%dir %{_sysconfdir}/dconf/db/site.d/locks
+%dir %{_sysconfdir}/dconf/db/distro.d
+%dir %{_sysconfdir}/dconf/db/distro.d/locks
 %dir %{_sysconfdir}/dconf/profile
 %{_libdir}/gio/modules/libdconfsettings.so
 %{_libexecdir}/dconf-service
@@ -76,6 +93,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_mandir}/man1/dconf-service.1.gz
 %{_mandir}/man1/dconf.1.gz
 %{_mandir}/man7/dconf.7.gz
+%config(noreplace) %{_sysconfdir}/dconf/profile/user
 
 %files devel
 %{_includedir}/dconf
@@ -85,6 +103,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/vala
 
 %changelog
+* Mon Feb 19 2018 Ray Strode <rstrode@redhat.com> - 0.26.1-3
+- Add systemd dbs for distro, site, and machine local dconf databases
+  Resolves: #1546644
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild