Move executables to /usr/libexec

diff --git a/Makefile b/Makefile
index 59fb392..426c666 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,11 +70,12 @@ install:
        $(INSTALL_PROGRAM) $(DESTDIR)/usr/bin usr/bin/time-slider-setup
        $(mkinstalldirs) $(DESTDIR)/usr/lib/time-slider/plugins/rsync
        $(mkinstalldirs) $(DESTDIR)/usr/lib/time-slider/plugins/zfssend
-       $(INSTALL_PROGRAM) $(DESTDIR)/usr/lib usr/lib/time-sliderd
-       $(INSTALL_PROGRAM) $(DESTDIR)/usr/lib usr/lib/time-slider-delete
-       $(INSTALL_PROGRAM) $(DESTDIR)/usr/lib usr/lib/time-slider-notify
-       $(INSTALL_PROGRAM) $(DESTDIR)/usr/lib usr/lib/time-slider-snapshot
-       $(INSTALL_PROGRAM) $(DESTDIR)/usr/lib usr/lib/time-slider-version
+       $(mkinstalldirs) $(DESTDIR)/usr/libexec
+       $(INSTALL_PROGRAM) $(DESTDIR)/usr/libexec usr/lib/time-sliderd
+       $(INSTALL_PROGRAM) $(DESTDIR)/usr/libexec usr/lib/time-slider-delete
+       $(INSTALL_PROGRAM) $(DESTDIR)/usr/libexec usr/lib/time-slider-notify
+       $(INSTALL_PROGRAM) $(DESTDIR)/usr/libexec usr/lib/time-slider-snapshot
+       $(INSTALL_PROGRAM) $(DESTDIR)/usr/libexec usr/lib/time-slider-version
        $(INSTALL_PROGRAM) $(DESTDIR)/usr/lib/time-slider/plugins/zfssend usr/lib/time-slider/plugins/zfssend/zfssend
        $(INSTALL_PROGRAM) $(DESTDIR)/usr/lib/time-slider/plugins/rsync usr/lib/time-slider/plugins/rsync/rsync-trigger
        $(INSTALL_PROGRAM) $(DESTDIR)/usr/lib/time-slider/plugins/rsync usr/lib/time-slider/plugins/rsync/rsync-backup

diff --git a/etc/systemd/system/time-sliderd.service b/etc/systemd/system/time-sliderd.service
index acf26b4..95bdc52 100644 (file)
--- a/etc/systemd/system/time-sliderd.service
+++ b/etc/systemd/system/time-sliderd.service
@@ -3,7 +3,7 @@ Description=Time slider daemon
 After=zfs.target
 
 [Service]
-ExecStart=/usr/lib/time-sliderd --foreground
+ExecStart=/usr/libexec/time-sliderd --foreground
 
 [Install]
 WantedBy=multi-user.target

diff --git a/rpm/time-slider.spec.in b/rpm/time-slider.spec.in
index 1ffac0c..495df67 100644 (file)
--- a/rpm/time-slider.spec.in
+++ b/rpm/time-slider.spec.in
@@ -36,7 +36,8 @@ rm -rf ${RPM_BUILD_ROOT}{/usr/bin,/usr/share/icons,/etc/xdg/,/usr/share/applicat
 %find_lang %{name}
 
 %files -f %{name}.lang
-%{_prefix}/lib/time-slider*
+%{_prefix}/libexec/*
+%{_prefix}/lib/time-slider
 %{_datadir}/time-slider
 %{_sysconfdir}/dbus-1/system.d/time-slider.conf
 %{_unitdir}/time-sliderd.service