From 39cb5888f8c05e0ef79153f5b3c9df61737e2610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret?= <frederic.epitre@orange.fr>
Date: Wed, 21 Feb 2018 19:11:13 +0100
Subject: [PATCH] centos: fix conflict with dconf

---
 Makefile                 | 2 ++
 rpm_spec/core-agent.spec | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index b1627d0..b9f59c8 100644
--- a/Makefile
+++ b/Makefile
@@ -289,8 +289,10 @@ install-common: install-doc
 	install -d $(DESTDIR)/usr/share/nautilus-python/extensions
 	install -m 0644 qubes-rpc/*_nautilus.py $(DESTDIR)/usr/share/nautilus-python/extensions
 
+ifeq ($(findstring CentOS,$(shell cat /etc/redhat-release)),)
 	install -D -m 0644 misc/dconf-profile-user $(DESTDIR)/etc/dconf/profile/user
 	install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi
+endif
 
 	install -D -m 0755 misc/qubes-desktop-run $(DESTDIR)$(BINDIR)/qubes-desktop-run
 
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index cd24342..2b6f5ba 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -615,8 +615,10 @@ rm -f %{name}-%{version}
 %if %{fedora} < 22
 /etc/yum/post-actions/qubes-trigger-sync-appmenus.action
 %endif
+%if 0%{?fedora} >= 23
 %config(noreplace) /etc/dconf/profile/user
 %config(noreplace) /etc/dconf/db/local.d/dpi
+%endif
 /usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf
 /usr/sbin/qubes-serial-login
 /usr/bin/qvm-copy-to-vm