diff --git a/Makefile b/Makefile index a859f38..f42d9b8 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,7 @@ VERSION := $(shell cat version) DIST ?= fc18 KDESERVICEDIR ?= /usr/share/kde4/services +KDE5SERVICEDIR ?= /usr/share/kservices5/ServiceMenus/ SBINDIR ?= /usr/sbin LIBDIR ?= /usr/lib SYSLIBDIR ?= /lib @@ -250,6 +251,8 @@ install-common: install -m 0644 misc/qubes-suspend-module-blacklist $(DESTDIR)/etc/qubes-suspend-module-blacklist install -d $(DESTDIR)/$(KDESERVICEDIR) install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-move.desktop,qvm-dvm.desktop} $(DESTDIR)/$(KDESERVICEDIR) + install -d $(DESTDIR)/$(KDE5SERVICEDIR) + install -m 0644 qubes-rpc/{qvm-copy.desktop,qvm-move.desktop,qvm-dvm.desktop} $(DESTDIR)/$(KDE5SERVICEDIR) install -d $(DESTDIR)/etc/qubes-rpc install -m 0755 qubes-rpc/{qubes.Filecopy,qubes.OpenInVM,qubes.VMShell,qubes.SyncNtpClock} $(DESTDIR)/etc/qubes-rpc install -m 0755 qubes-rpc/qubes.OpenURL $(DESTDIR)/etc/qubes-rpc diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec index 57527a2..eb790da 100644 --- a/rpm_spec/core-vm.spec +++ b/rpm_spec/core-vm.spec @@ -201,6 +201,7 @@ DNF plugin for Qubes specific post-installation actions: %define _builddir %(pwd) %define kde_service_dir /usr/share/kde4/services +%define kde5_service_dir /usr/share/kservices5/ServiceMenus %description The Qubes core files for installation inside a Qubes VM. @@ -419,6 +420,9 @@ rm -f %{name}-%{version} %{kde_service_dir}/qvm-copy.desktop %{kde_service_dir}/qvm-move.desktop %{kde_service_dir}/qvm-dvm.desktop +%{kde5_service_dir}/qvm-copy.desktop +%{kde5_service_dir}/qvm-move.desktop +%{kde5_service_dir}/qvm-dvm.desktop /etc/NetworkManager/dispatcher.d/30-qubes-external-ip /etc/NetworkManager/dispatcher.d/qubes-nmhook %config(noreplace) /etc/X11/xorg-preload-apps.conf