From 1dcef1fbedc00584e6e0cd2eeea12c7bd0669a50 Mon Sep 17 00:00:00 2001 From: Manuel Bachmann Date: Wed, 10 Sep 2014 18:08:35 +0200 Subject: [PATCH] Fix systemd install path on 64-bit architecture Contrary to what happens with binary install paths in the general case, systemd unit files will still be installed to "/usr/lib" (even if "/usr/lib64" exists e.g.). Change-Id: Ib46615529860236c0c4a256148399ae42f31d6a4 Signed-off-by: Manuel Bachmann --- packaging/modello-homescreen.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/modello-homescreen.spec b/packaging/modello-homescreen.spec index b3155eb..bc1a318 100644 --- a/packaging/modello-homescreen.spec +++ b/packaging/modello-homescreen.spec @@ -23,17 +23,17 @@ A proof of concept pure html5 UI install -m 0644 Homescreen_icon.png %{buildroot}%{_datadir}/Modello/Common/icons mkdir -p %{buildroot}%{_bindir} - mkdir -p %{buildroot}%{_libdir}/systemd/user/weston.target.wants/ + mkdir -p %{buildroot}%{_unitdir_user}/weston.target.wants/ install -m 755 systemd/modello_launcher.sh %{buildroot}%{_bindir} - install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user - install -m 0644 systemd/Modello_Homescreen.service %{buildroot}%{_libdir}/systemd/user - ln -sf ../Modello_Homescreen-launchpad-ready.path %{buildroot}%{_libdir}/systemd/user/weston.target.wants/ + install -m 0644 systemd/Modello_Homescreen-launchpad-ready.path %{buildroot}%{_unitdir_user} + install -m 0644 systemd/Modello_Homescreen.service %{buildroot}%{_unitdir_user} + ln -sf ../Modello_Homescreen-launchpad-ready.path %{buildroot}%{_unitdir_user}/weston.target.wants/ %files %defattr(-,root,root,-) %{TZ_SYS_APP_PREINSTALL}/Modello_Homescreen.wgt %{_datadir}/Modello/Common/icons/Homescreen_icon.png -%{_libdir}/systemd/user/Modello_Homescreen.service -%{_libdir}/systemd/user/Modello_Homescreen-launchpad-ready.path +%{_unitdir_user}/Modello_Homescreen.service +%{_unitdir_user}/Modello_Homescreen-launchpad-ready.path %{_bindir}/modello_launcher.sh -%{_libdir}/systemd/user/weston.target.wants +%{_unitdir_user}/weston.target.wants -- 2.7.4