distro: move binaries to /usr/libexec to follow Fedora packaging guidelines

This makes no difference, so let's just put them where the Fedora
guidelines say they should be.

Also, make sure to own the containing directory.

Signed-off-by: Tom Gundersen <teg@jklm.no>

Makefile

@@ -6,10 +6,10 @@ build:
 
 .PHONY: install
 install:
-	- mkdir -p /usr/lib/osbuild-composer
-	cp osbuild-composer /usr/lib/osbuild-composer/
-	cp osbuild-worker /usr/lib/osbuild-composer/
-	cp dnf-json /usr/lib/osbuild-composer/
+	- mkdir -p /usr/libexec/osbuild-composer
+	cp osbuild-composer /usr/libexec/osbuild-composer/
+	cp osbuild-worker /usr/libexec/osbuild-composer/
+	cp dnf-json /usr/libexec/osbuild-composer/
 	- mkdir -p /etc/sysusers.d/
 	cp distribution/osbuild-composer.conf /etc/sysusers.d/
 	systemd-sysusers osbuild-composer.conf

distribution/osbuild-composer.service

@@ -5,9 +5,9 @@ Requires=osbuild-composer.socket
 
 [Service]
 Type=simple
-ExecStart=/usr/lib/osbuild-composer/osbuild-composer
+ExecStart=/usr/libexec/osbuild-composer/osbuild-composer
 StateDirectory=osbuild-composer
-WorkingDirectory=/usr/lib/osbuild-composer/
+WorkingDirectory=/usr/libexec/osbuild-composer/
 User=_osbuild-composer
 Restart=on-failure
 

distribution/osbuild-worker@.service

@@ -5,7 +5,7 @@ After=multi-user.target osbuild-composer.socket
 [Service]
 Type=simple
 PrivateTmp=true
-ExecStart=/usr/lib/osbuild-composer/osbuild-worker -C /var/lib/osbuild
+ExecStart=/usr/libexec/osbuild-composer/osbuild-worker -C /var/lib/osbuild
 CacheDirectory=osbuild-composer
 Restart=on-failure
 RestartSec=10s

golang-github-osbuild-composer.spec

@@ -43,9 +43,9 @@ done
 
 
 %install
-install -m 0755 -vd                                         %{buildroot}%{_prefix}/lib/osbuild-composer
-install -m 0755 -vp _bin/*                                  %{buildroot}%{_prefix}/lib/osbuild-composer/
-install -m 0644 -vp dnf-json                                %{buildroot}%{_prefix}/lib/osbuild-composer/
+install -m 0755 -vd                                         %{buildroot}%{_libexecdir}/osbuild-composer
+install -m 0755 -vp _bin/*                                  %{buildroot}%{_libexecdir}/osbuild-composer/
+install -m 0644 -vp dnf-json                                %{buildroot}%{_libexecdir}/osbuild-composer/
 
 install -m 0755 -vd                                         %{buildroot}%{_unitdir}
 install -m 0644 -vp distribution/*.{service,socket}         %{buildroot}%{_unitdir}/
@@ -71,7 +71,8 @@ export GOPATH=$(pwd)/_build:%{gopath}
 %files
 %license LICENSE
 %doc README.md
-%{_prefix}/lib/osbuild-composer/*
+%{_libexecdir}/osbuild-composer
+%{_libexecdir}/osbuild-composer/*
 %{_unitdir}/*.{service,socket}
 %{_sysusersdir}/osbuild-composer.conf