From a3838eedbc6a85704083987a29a10b031ab10c2b Mon Sep 17 00:00:00 2001
From: Bernhard M. Wiedemann <bwiedemann+opensusegit@suse.de>
Date: Jun 24 2020 13:47:57 +0000
Subject: Update aaa_base to rev 469 via SR 815303


https://build.opensuse.org/request/show/815303
by user lnussel + dimstar_suse

---

diff --git a/.files b/.files
index 7fc207f..c97adcc 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 79f6498..8875e90 100644
--- a/.rev
+++ b/.rev
@@ -3774,4 +3774,12 @@
     <comment></comment>
     <requestid>805525</requestid>
   </revision>
+  <revision rev="469" vrev="3">
+    <srcmd5>329cc55b578be226a26c40b5581adf26</srcmd5>
+    <version>84.87+git20200507.e2243a4</version>
+    <time>1593006450</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>815303</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index efc3c27..e58d2a1 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-996a10e335198a7410e4b4fdbdb2fb19
+0b9eedf26e5f3e9a0ad7026814935f7a
diff --git a/aaa_base.changes b/aaa_base.changes
index 4e34eb4..ad42074 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+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>
 
 - move shell aliases back to main package. They don't cost anything
diff --git a/aaa_base.spec b/aaa_base.spec
index 580f642..47678ef 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