From 63f19ecb17ae94e5137f824eee42ce6b2499714c413ae207f41cf8834c854261 Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Mon, 11 May 2020 14:47:27 +0000 Subject: [PATCH 1/2] Accepting request 800991 from home:pgajdos:libexec - %{_libexecdir} now expands to /usr/libexec, so do not use it where /usr/lib was intended; use %{_tmpfilesdir} in this case instead OBS-URL: https://build.opensuse.org/request/show/800991 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/restorecond?expand=0&rev=13 --- restorecond.changes | 7 +++++++ restorecond.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/restorecond.changes b/restorecond.changes index 39429a5..77b98d8 100644 --- a/restorecond.changes +++ b/restorecond.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 7 08:44:43 UTC 2020 - pgajdos@suse.com + +- %{_libexecdir} now expands to /usr/libexec, so do not use it + where /usr/lib was intended; use %{_tmpfilesdir} in this case + instead + ------------------------------------------------------------------- Tue Mar 3 12:28:15 UTC 2020 - Johannes Segitz diff --git a/restorecond.spec b/restorecond.spec index f1e452b..d788572 100644 --- a/restorecond.spec +++ b/restorecond.spec @@ -61,7 +61,7 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcrestorecond %config %{_sysconfdir}/selinux/restorecond.conf %config(noreplace) %{_sysconfdir}/selinux/restorecond_user.conf %{_sysconfdir}/xdg/autostart/restorecond.desktop -%{_libexecdir}/systemd/system/restorecond.service +/usr/lib/systemd/system/restorecond.service %{_sbindir}/restorecond %{_sbindir}/rcrestorecond %{_datadir}/dbus-1/services/org.selinux.Restorecond.service From 2fff5494e5aca4b46d449430d277ab1bbfbb2d0ffbb439e7ceae3f9876b0e021 Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Tue, 12 May 2020 06:52:37 +0000 Subject: [PATCH 2/2] - Use %{_unitdir} for the location of the .service file where /usr/lib was intended OBS-URL: https://build.opensuse.org/package/show/security:SELinux/restorecond?expand=0&rev=14 --- restorecond.changes | 8 ++++++-- restorecond.spec | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/restorecond.changes b/restorecond.changes index 77b98d8..01655da 100644 --- a/restorecond.changes +++ b/restorecond.changes @@ -1,9 +1,13 @@ +------------------------------------------------------------------- +Tue May 12 06:50:33 UTC 2020 - Johannes Segitz + +- Use %{_unitdir} for the location of the .service file + ------------------------------------------------------------------- Thu May 7 08:44:43 UTC 2020 - pgajdos@suse.com - %{_libexecdir} now expands to /usr/libexec, so do not use it - where /usr/lib was intended; use %{_tmpfilesdir} in this case - instead + where /usr/lib was intended ------------------------------------------------------------------- Tue Mar 3 12:28:15 UTC 2020 - Johannes Segitz diff --git a/restorecond.spec b/restorecond.spec index d788572..23215e6 100644 --- a/restorecond.spec +++ b/restorecond.spec @@ -61,7 +61,8 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcrestorecond %config %{_sysconfdir}/selinux/restorecond.conf %config(noreplace) %{_sysconfdir}/selinux/restorecond_user.conf %{_sysconfdir}/xdg/autostart/restorecond.desktop -/usr/lib/systemd/system/restorecond.service +%{_unitdir}/restorecond.service + %{_sbindir}/restorecond %{_sbindir}/rcrestorecond %{_datadir}/dbus-1/services/org.selinux.Restorecond.service