move qubes-notify-* to libexec

CertainLach · Nov 19, 2014 · 72e415a · 72e415a
1 parent ed13972
commit 72e415a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -48,6 +48,7 @@ install:
 	$(MAKE) install -C dispvm
 	$(MAKE) install -C tests
 	mkdir -p $(DESTDIR)/etc/qubes-rpc/policy
+	mkdir -p $(DESTDIR)/usr/libexec/qubes
 	cp qubes-rpc-policy/qubes.Filecopy.policy $(DESTDIR)/etc/qubes-rpc/policy/qubes.Filecopy
 	cp qubes-rpc-policy/qubes.OpenInVM.policy $(DESTDIR)/etc/qubes-rpc/policy/qubes.OpenInVM
 	cp qubes-rpc-policy/qubes.VMShell.policy $(DESTDIR)/etc/qubes-rpc/policy/qubes.VMShell
@@ -56,8 +57,8 @@ install:
 	cp qubes-rpc-policy/qubes.GetImageRGBA.policy $(DESTDIR)/etc/qubes-rpc/policy/qubes.GetImageRGBA
 	cp qubes-rpc/qubes.NotifyUpdates $(DESTDIR)/etc/qubes-rpc/
 	cp qubes-rpc/qubes.NotifyTools $(DESTDIR)/etc/qubes-rpc/
-	cp qubes-rpc/qubes-notify-updates $(DESTDIR)/usr/lib/qubes/
-	cp qubes-rpc/qubes-notify-tools $(DESTDIR)/usr/lib/qubes/
+	cp qubes-rpc/qubes-notify-updates $(DESTDIR)/usr/libexec/qubes/
+	cp qubes-rpc/qubes-notify-tools $(DESTDIR)/usr/libexec/qubes/
 	mkdir -p $(DESTDIR)/usr/share/qubes
 	cp xen-vm-config/vm-template.xml $(DESTDIR)/usr/share/qubes/xen-vm-template.xml
 	cp xen-vm-config/vm-template-hvm.xml $(DESTDIR)/usr/share/qubes/

diff --git a/qubes-rpc/qubes.NotifyTools b/qubes-rpc/qubes.NotifyTools
@@ -1 +1 @@
-/usr/lib/qubes/qubes-notify-tools
+/usr/libexec/qubes/qubes-notify-tools
diff --git a/qubes-rpc/qubes.NotifyUpdates b/qubes-rpc/qubes.NotifyUpdates
@@ -1 +1 @@
-/usr/lib/qubes/qubes-notify-updates
+/usr/libexec/qubes/qubes-notify-updates
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
@@ -205,8 +205,6 @@ fi
 /usr/lib/qubes/cleanup-dispvms
 /usr/lib/qubes/qmemman_daemon.py*
 /usr/lib/qubes/qfile-daemon-dvm*
-/usr/lib/qubes/qubes-notify-tools
-/usr/lib/qubes/qubes-notify-updates
 /usr/lib/qubes/block-cleaner-daemon.py*
 /usr/lib/qubes/vusb-ctl.py*
 /usr/lib/qubes/xl-qvm-usb-attach.py*
@@ -215,6 +213,8 @@ fi
 /usr/lib/qubes/startup-dvm.sh
 /usr/lib/qubes/startup-misc.sh
 /usr/lib/qubes/prepare-volatile-img.sh
+/usr/libexec/qubes/qubes-notify-tools
+/usr/libexec/qubes/qubes-notify-updates
 %{_unitdir}/qubes-block-cleaner.service
 %{_unitdir}/qubes-core.service
 %{_unitdir}/qubes-setupdvm.service
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/usr/lib/qubes/qubes-notify-tools
		/usr/libexec/qubes/qubes-notify-tools
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/usr/lib/qubes/qubes-notify-updates
		/usr/libexec/qubes/qubes-notify-updates