diff --git a/Makefile b/Makefile index 0e6e9a9..b1dbda3 100644 --- a/Makefile +++ b/Makefile @@ -282,8 +282,10 @@ install-common: 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)/usr/bin/qubes-desktop-run diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 7df205d..668e966 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -504,8 +504,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