diff --git a/plymouth.changes b/plymouth.changes index 0923053..b9057ef 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Feb 13 14:25:36 UTC 2021 - Arjen de Korte + +- 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 diff --git a/plymouth.spec b/plymouth.spec index a89d66a..b48fc70 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,7 +1,7 @@ # # 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 # 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 [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration fi -%service_add_post %postun %{?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 rm -f %{_libdir}/plymouth/default.so rm -f /boot/initrd-plymouth.img @@ -432,6 +435,12 @@ fi %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 %postun -n libply-boot-client%{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 %post -n libply%{soversion} -p /sbin/ldconfig %postun -n libply%{soversion} -p /sbin/ldconfig +%endif + %post theme-spinfinity if [ $1 -eq 1 ]; then set -x