From a9f8203f2ce3351589861789559ca036bfbfa2050d679f766a5794f37507bb88 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <lnussel@suse.com>
Date: Tue, 16 Jun 2020 17:45:09 +0000
Subject: [PATCH] Accepting request 815242 from home:dimstar:Factory

- Properly adjust usr/bin/service to look for legacy-action
  initscripts in %{_libexecdir}/initscripts/legacy-action, no
  matter what the value of %{_libexecdir} is (planned to change
  from /usr/lib to /usr/libexec)

OBS-URL: https://build.opensuse.org/request/show/815242
OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=696
---
 aaa_base.changes | 8 ++++++++
 aaa_base.spec    | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/aaa_base.changes b/aaa_base.changes
index 96058e9..1508637 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jun 16 12:37:10 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Properly adjust usr/bin/service to look for legacy-action
+  initscripts in %{_libexecdir}/initscripts/legacy-action, no
+  matter what the value of %{_libexecdir} is (planned to change
+  from /usr/lib to /usr/libexec)
+
 -------------------------------------------------------------------
 Wed May 13 08:28:06 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 3ac3aed..fca560a 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -96,6 +96,8 @@ systems.
 
 %prep
 %setup -q
+sed -i 's|actiondir="/usr/lib/initscripts/legacy-actions"|actiondir="%{_libexecdir}/initscripts/legacy-actions"|' \
+    files/usr/sbin/service
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}
@@ -126,7 +128,7 @@ for i in boot.local after.local halt.local ; do
   chmod 755 $RPM_BUILD_ROOT/etc/init.d/$i
 done
 #
-install -d -m 755 %buildroot/usr/lib/initscripts/legacy-actions
+install -d -m 755 %buildroot%{_libexecdir}/initscripts/legacy-actions
 # keep as ghost for migration
 touch %buildroot/etc/inittab
 
@@ -224,8 +226,8 @@ mkdir -p %{buildroot}%{_fillupdir}
 /usr/share/man/man8/safe-rmdir.8*
 /usr/share/man/man8/service.8*
 /usr/lib/sysctl.d/*.conf
-%dir /usr/lib/initscripts
-%dir /usr/lib/initscripts/legacy-actions
+%dir %{_libexecdir}/initscripts
+%dir %{_libexecdir}/initscripts/legacy-actions
 %{_fillupdir}/sysconfig.language
 %{_fillupdir}/sysconfig.proxy
 %{_fillupdir}/sysconfig.windowmanager