Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

centos: fix conflict with dconf

Browse Source
This commit is contained in:
Frédéric Pierret 2018-02-21 19:11:13 +01:00
parent 68304ef9f5
commit 39cb5888f8
No known key found for this signature in database
GPG Key ID: 1DABC232BE02201E
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -289,8 +289,10 @@ install-common: install-doc
install -d $(DESTDIR)/usr/share/nautilus-python/extensions install -d $(DESTDIR)/usr/share/nautilus-python/extensions
install -m 0644 qubes-rpc/*_nautilus.py $(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-profile-user $(DESTDIR)/etc/dconf/profile/user
install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi 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 install -D -m 0755 misc/qubes-desktop-run $(DESTDIR)$(BINDIR)/qubes-desktop-run

2
rpm_spec/core-agent.spec
View File

@ -615,8 +615,10 @@ rm -f %{name}-%{version}
%if %{fedora} < 22 %if %{fedora} < 22
/etc/yum/post-actions/qubes-trigger-sync-appmenus.action /etc/yum/post-actions/qubes-trigger-sync-appmenus.action
%endif %endif
%if 0%{?fedora} >= 23
%config(noreplace) /etc/dconf/profile/user %config(noreplace) /etc/dconf/profile/user
%config(noreplace) /etc/dconf/db/local.d/dpi %config(noreplace) /etc/dconf/db/local.d/dpi
%endif
/usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf /usr/lib/systemd/system/user@.service.d/90-session-stop-timeout.conf
/usr/sbin/qubes-serial-login /usr/sbin/qubes-serial-login
/usr/bin/qvm-copy-to-vm /usr/bin/qvm-copy-to-vm