rpm/plymouth
SHA256
1
0
Fork 0
forked from pool/plymouth
Code Pull Requests Activity

Accepting request 871759 from home:adkorte:branches:Base:System

Browse Source 
- Fix broken use of %service_add_post and %service_del_postun. Without
  any services specified, the first is a no-op, the latter will only
  execute systemctl daemon-reload (boo#1179849).
- Use %ldconfig_scriptlets macro in Tumbleweed

OBS-URL: https://build.opensuse.org/request/show/871759
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=291
This commit is contained in:
Cliff Zhao 2021-02-15 15:37:24 +00:00 committed by Git OBS Bridge
parent 3f75f2d17e
commit e73ff7f053
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plymouth.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Feb 13 14:25:36 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>
- Fix broken use of %service_add_post and %service_del_postun. Without
any services specified, the first is a no-op, the latter will only
execute systemctl daemon-reload (boo#1179849).
- Use %ldconfig_scriptlets macro in Tumbleweed
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 1 15:18:48 UTC 2021 - Cliff Zhao <qzhao@suse.com> Mon Feb 1 15:18:48 UTC 2021 - Cliff Zhao <qzhao@suse.com>

17
plymouth.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package plymouth # spec file for package plymouth
# #
# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -419,11 +419,14 @@ rm -f %{buildroot}%{_datadir}/plymouth/plymouthd.conf
if [ ! -e /.buildenv ]; then if [ ! -e /.buildenv ]; then
[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
fi fi
%service_add_post
%postun %postun
%{?regenerate_initrd_post} %{?regenerate_initrd_post}
%service_del_postun %if 0%{?suse_version} > 1500
%service_del_postun_without_restart
%else
%systemd_postun
%endif
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
rm -f %{_libdir}/plymouth/default.so rm -f %{_libdir}/plymouth/default.so
rm -f /boot/initrd-plymouth.img rm -f /boot/initrd-plymouth.img
@ -432,6 +435,12 @@ fi
%posttrans %posttrans
%{?regenerate_initrd_posttrans} %{?regenerate_initrd_posttrans}
%if 0%{?suse_version} > 1500
%ldconfig_scriptlets -n libply-boot-client%{soversion}
%ldconfig_scriptlets -n libply-splash-core%{soversion}
%ldconfig_scriptlets -n libply-splash-graphics%{soversion}
%ldconfig_scriptlets -n libply%{soversion}
%else
%post -n libply-boot-client%{soversion} -p /sbin/ldconfig %post -n libply-boot-client%{soversion} -p /sbin/ldconfig
%postun -n libply-boot-client%{soversion} -p /sbin/ldconfig %postun -n libply-boot-client%{soversion} -p /sbin/ldconfig
%post -n libply-splash-core%{soversion} -p /sbin/ldconfig %post -n libply-splash-core%{soversion} -p /sbin/ldconfig
@ -440,6 +449,8 @@ fi
%postun -n libply-splash-graphics%{soversion} -p /sbin/ldconfig %postun -n libply-splash-graphics%{soversion} -p /sbin/ldconfig
%post -n libply%{soversion} -p /sbin/ldconfig %post -n libply%{soversion} -p /sbin/ldconfig
%postun -n libply%{soversion} -p /sbin/ldconfig %postun -n libply%{soversion} -p /sbin/ldconfig
%endif
%post theme-spinfinity %post theme-spinfinity
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
set -x set -x