From 8ce8c9d5c78c4a12314855063b14e7203866070e9b34f39d811bd970e982fbd1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 24 Jun 2020 13:47:30 +0000 Subject: [PATCH] Accepting request 815303 from Base:System OBS-URL: https://build.opensuse.org/request/show/815303 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=469 --- 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 + +- 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 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