From 0e867f8f06a96f58fcc913c95e182c12f058abc16fae29e89563968992a065cf Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Thu, 16 Jul 2020 06:40:33 +0000 Subject: [PATCH] Accepting request 821224 from home:jsegitz:branches:security:SELinux - Use proper macros for SYSTEMDSYSTEMUNITDIR and SYSTEMDUSERUNITDIR OBS-URL: https://build.opensuse.org/request/show/821224 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/restorecond?expand=0&rev=17 --- restorecond.changes | 5 +++++ restorecond.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/restorecond.changes b/restorecond.changes index 38ea7cb..70c5e58 100644 --- a/restorecond.changes +++ b/restorecond.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 15 14:27:05 UTC 2020 - Johannes Segitz + +- Use proper macros for SYSTEMDSYSTEMUNITDIR and SYSTEMDUSERUNITDIR + ------------------------------------------------------------------- Tue Jul 14 08:32:09 UTC 2020 - Johannes Segitz diff --git a/restorecond.spec b/restorecond.spec index 9b85154..f64c2c2 100644 --- a/restorecond.spec +++ b/restorecond.spec @@ -41,7 +41,7 @@ export CFLAGS="%optflags" %make_build LSPP_PRIV=y all %install -make DESTDIR=%{buildroot} SHLIBDIR=/%{_lib} SYSTEMDSYSTEMUNITDIR=/usr/lib/systemd/system SYSTEMDUSERUNITDIR=/usr/lib/systemd/user install +make DESTDIR=%{buildroot} SHLIBDIR=/%{_lib} SYSTEMDSYSTEMUNITDIR=%{_unitdir} SYSTEMDUSERUNITDIR=%{_userunitdir} install rm %{buildroot}%{_sysconfdir}/rc.d/init.d/restorecond ln -s /sbin/service %{buildroot}%{_sbindir}/rcrestorecond @@ -62,7 +62,7 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcrestorecond %config(noreplace) %{_sysconfdir}/selinux/restorecond_user.conf %{_sysconfdir}/xdg/autostart/restorecond.desktop %{_unitdir}/restorecond.service -/usr/lib/systemd/user/restorecond_user.service +%{_userunitdir}/restorecond_user.service %{_sbindir}/restorecond %{_sbindir}/rcrestorecond