testing/aaa_base
SHA256
3
0
Fork 0
forked from pool/aaa_base
Code Pull Requests Activity

Accepting request 815303 from Base:System

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2020-06-24 13:47:30 +00:00 committed by Git OBS Bridge
commit f42ae2cb97
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aaa_base.changes
View File

@ -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> Wed May 13 08:28:06 UTC 2020 - Ludwig Nussel <lnussel@suse.de>

8
aaa_base.spec
View File

@ -96,6 +96,8 @@ systems.
%prep %prep
%setup -q %setup -q
sed -i 's|actiondir="/usr/lib/initscripts/legacy-actions"|actiondir="%{_libexecdir}/initscripts/legacy-actions"|' \
files/usr/sbin/service
%build %build
make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} 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 chmod 755 $RPM_BUILD_ROOT/etc/init.d/$i
done 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 # keep as ghost for migration
touch %buildroot/etc/inittab touch %buildroot/etc/inittab
@ -224,8 +226,8 @@ mkdir -p %{buildroot}%{_fillupdir}
/usr/share/man/man8/safe-rmdir.8* /usr/share/man/man8/safe-rmdir.8*
/usr/share/man/man8/service.8* /usr/share/man/man8/service.8*
/usr/lib/sysctl.d/*.conf /usr/lib/sysctl.d/*.conf
%dir /usr/lib/initscripts %dir %{_libexecdir}/initscripts
%dir /usr/lib/initscripts/legacy-actions %dir %{_libexecdir}/initscripts/legacy-actions
%{_fillupdir}/sysconfig.language %{_fillupdir}/sysconfig.language
%{_fillupdir}/sysconfig.proxy %{_fillupdir}/sysconfig.proxy
%{_fillupdir}/sysconfig.windowmanager %{_fillupdir}/sysconfig.windowmanager