From 4a2d46fc8b278bcdd57c9a115461414d5959c101 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Sat, 27 Apr 2024 09:11:19 -0400
Subject: [PATCH] Move libexec content to libexecdir

---
 incus-startup.service |  4 ++--
 incus-user.service    |  2 +-
 incus.service         |  4 ++--
 incus.spec            | 11 +++++------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/incus-startup.service b/incus-startup.service
index 15df8aa..4c8ea06 100644
--- a/incus-startup.service
+++ b/incus-startup.service
@@ -6,8 +6,8 @@ Requires=incus.socket
 
 [Service]
 Type=oneshot
-ExecStart=/usr/lib/incus/incusd activateifneeded
-ExecStop=/usr/lib/incus/shutdown
+ExecStart=/usr/libexec/incus/incusd activateifneeded
+ExecStop=/usr/libexec/incus/shutdown
 TimeoutStartSec=600s
 TimeoutStopSec=600s
 RemainAfterExit=yes
diff --git a/incus-user.service b/incus-user.service
index 64f9c22..d0242b1 100644
--- a/incus-user.service
+++ b/incus-user.service
@@ -4,7 +4,7 @@ After=incus-user.socket incus.service
 Requires=incus-user.socket
 
 [Service]
-ExecStart=/usr/lib/incus/incus-user --group incus
+ExecStart=/usr/libexec/incus/incus-user --group incus
 Restart=on-failure
 
 [Install]
diff --git a/incus.service b/incus.service
index a3ace5c..5f42773 100644
--- a/incus.service
+++ b/incus.service
@@ -7,8 +7,8 @@ Documentation=man:incusd(1)
 [Service]
 Environment=INCUS_DOCUMENTATION=/usr/share/doc/incus-doc/html
 Environment=INCUS_OVMF_PATH=/usr/share/edk2/ovmf
-ExecStart=/usr/lib/incus/incusd --group incus-admin
-ExecStartPost=/usr/lib/incus/incusd waitready --timeout=600
+ExecStart=/usr/libexec/incus/incusd --group incus-admin
+ExecStartPost=/usr/libexec/incus/incusd waitready --timeout=600
 KillMode=process
 TimeoutStartSec=600s
 TimeoutStopSec=30s
diff --git a/incus.spec b/incus.spec
index f4df502..e452bd5 100644
--- a/incus.spec
+++ b/incus.spec
@@ -57,7 +57,6 @@ Source203:      %{swaggerui_source_baseurl}/swagger-ui.css#/swagger-ui-%{swagger
 # Allow offline builds
 Patch0:         incus-0.2-doc-Remove-downloads-from-sphinx-build.patch
 
-%global incuslibdir %{_prefix}/lib/incus
 %global bashcompletiondir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || :)
 %global selinuxtype targeted
 
@@ -141,8 +140,7 @@ This package contains the Incus daemon.
 %{_unitdir}/%{name}-startup.service
 %{_unitdir}/%{name}-user.socket
 %{_unitdir}/%{name}-user.service
-%dir %{incuslibdir}
-%{incuslibdir}/*
+%{_libexecdir}/%{name}/
 %{_sysusersdir}/%{name}.conf
 %{_tmpfilesdir}/%{name}.conf
 %{_mandir}/man1/incusd*.1.*
@@ -422,9 +420,9 @@ install -D -m0644 -vp %{SOURCE109} %{buildroot}%{_sysctldir}/10-incus-inotify.co
 install -D -m0644 -vp selinux/%{name}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
 
 # install helper libs
-install -d %{buildroot}%{incuslibdir}
-install -m0755 -vp %{SOURCE110} %{buildroot}%{incuslibdir}/
-install -m0755 -vp %{gobuilddir}/lib/* %{buildroot}%{incuslibdir}/
+install -d %{buildroot}%{_libexecdir}/%{name}
+install -m0755 -vp %{SOURCE110} %{buildroot}%{_libexecdir}/%{name}/
+install -m0755 -vp %{gobuilddir}/lib/* %{buildroot}%{_libexecdir}/%{name}/
 
 # install manpages
 install -d %{buildroot}%{_mandir}/man1
@@ -465,6 +463,7 @@ export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
 %changelog
 * Sat Apr 27 2024 Neal Gompa <ngompa@fedoraproject.org> - 6.0.0-1
 - Update to 6.0.0
+- Move libexec content to libexecdir
 
 * Wed Mar 27 2024 Neal Gompa <ngompa@fedoraproject.org> - 0.7-1
 - Update to 0.7