From e237109738b3dacd261fc92f073575899f4c3149b7b9487fb4347f4e9e97b2a4 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Wed, 8 May 2024 07:28:35 +0000 Subject: [PATCH] Accepting request 1172643 from home:qzhao:branches:Base:System Update plymouth.spec: Add service in installation, remove service in uninstallation based on systemd requirement. OBS-URL: https://build.opensuse.org/request/show/1172643 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=376 --- plymouth.spec | 111 +++----------------------------------------------- 1 file changed, 6 insertions(+), 105 deletions(-) diff --git a/plymouth.spec b/plymouth.spec index 4ab3e31..5e30ea1 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -21,6 +21,7 @@ %bcond_with x11_renderer %global soversion 5 +%global plymouth-services plymouth-halt.service plymouth-switch-root-initramfs.service plymouth-start.service plymouth-switch-root.service plymouth-kexec.service plymouth-switch-root-initramfs.service plymouth-quit-wait.service plymouth-quit.service plymouth-halt.service plymouth-kexec.service plymouth-poweroff.service plymouth-quit-wait.service plymouth-quit.service plymouth-read-write.service plymouth-reboot.service plymouth-start.service plymouth-switch-root-initramfs.service plymouth-switch-root.service plymouth-poweroff.service plymouth-switch-root-initramfs.service plymouth-reboot.service plymouth-switch-root-initramfs.service plymouth-read-write.service plymouth-start.service systemd-ask-password-plymouth.path systemd-ask-password-plymouth.service Name: plymouth Version: 22.02.122+94.4bd41a3 @@ -85,7 +86,7 @@ Requires: %{name}-branding Requires: systemd >= 186 Requires(post): coreutils Requires(post): plymouth-scripts = %{version} -Requires(postun): coreutils +Requires(postun):coreutils Suggests: plymouth-plugin-label Provides: bootsplash = 3.5 Obsoletes: bootsplash < 3.5 @@ -408,117 +409,17 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/lo %find_lang %{name} %pre -%service_add_pre plymouth-halt.service -%service_add_pre plymouth-switch-root-initramfs.service -%service_add_pre plymouth-start.service -%service_add_pre plymouth-switch-root.service -%service_add_pre plymouth-kexec.service -%service_add_pre plymouth-switch-root-initramfs.service -%service_add_pre plymouth-quit-wait.service -%service_add_pre plymouth-quit.service -%service_add_pre plymouth-halt.service -%service_add_pre plymouth-kexec.service -%service_add_pre plymouth-poweroff.service -%service_add_pre plymouth-quit-wait.service -%service_add_pre plymouth-quit.service -%service_add_pre plymouth-read-write.service -%service_add_pre plymouth-reboot.service -%service_add_pre plymouth-start.service -%service_add_pre plymouth-switch-root-initramfs.service -%service_add_pre plymouth-switch-root.service -%service_add_pre plymouth-poweroff.service -%service_add_pre plymouth-switch-root-initramfs.service -%service_add_pre plymouth-reboot.service -%service_add_pre plymouth-switch-root-initramfs.service -%service_add_pre plymouth-read-write.service -%service_add_pre plymouth-start.service -%service_add_pre systemd-ask-password-plymouth.path -%service_add_pre systemd-ask-password-plymouth.service +%service_add_pre %{plymouth-services} %post -%service_add_post plymouth-halt.service -%service_add_post plymouth-switch-root-initramfs.service -%service_add_post plymouth-start.service -%service_add_post plymouth-switch-root.service -%service_add_post plymouth-kexec.service -%service_add_post plymouth-switch-root-initramfs.service -%service_add_post plymouth-quit-wait.service -%service_add_post plymouth-quit.service -%service_add_post plymouth-halt.service -%service_add_post plymouth-kexec.service -%service_add_post plymouth-poweroff.service -%service_add_post plymouth-quit-wait.service -%service_add_post plymouth-quit.service -%service_add_post plymouth-read-write.service -%service_add_post plymouth-reboot.service -%service_add_post plymouth-start.service -%service_add_post plymouth-switch-root-initramfs.service -%service_add_post plymouth-switch-root.service -%service_add_post plymouth-poweroff.service -%service_add_post plymouth-switch-root-initramfs.service -%service_add_post plymouth-reboot.service -%service_add_post plymouth-switch-root-initramfs.service -%service_add_post plymouth-read-write.service -%service_add_post plymouth-start.service -%service_add_post systemd-ask-password-plymouth.path -%service_add_post systemd-ask-password-plymouth.service +%service_add_post %{plymouth-services} %{?regenerate_initrd_post} %preun -%service_del_preun plymouth-halt.service -%service_del_preun plymouth-switch-root-initramfs.service -%service_del_preun plymouth-start.service -%service_del_preun plymouth-switch-root.service -%service_del_preun plymouth-kexec.service -%service_del_preun plymouth-switch-root-initramfs.service -%service_del_preun plymouth-quit-wait.service -%service_del_preun plymouth-quit.service -%service_del_preun plymouth-halt.service -%service_del_preun plymouth-kexec.service -%service_del_preun plymouth-poweroff.service -%service_del_preun plymouth-quit-wait.service -%service_del_preun plymouth-quit.service -%service_del_preun plymouth-read-write.service -%service_del_preun plymouth-reboot.service -%service_del_preun plymouth-start.service -%service_del_preun plymouth-switch-root-initramfs.service -%service_del_preun plymouth-switch-root.service -%service_del_preun plymouth-poweroff.service -%service_del_preun plymouth-switch-root-initramfs.service -%service_del_preun plymouth-reboot.service -%service_del_preun plymouth-switch-root-initramfs.service -%service_del_preun plymouth-read-write.service -%service_del_preun plymouth-start.service -%service_del_preun systemd-ask-password-plymouth.path -%service_del_preun systemd-ask-password-plymouth.service +%service_del_preun %{plymouth-services} %postun -%service_del_postun plymouth-halt.service -%service_del_postun plymouth-switch-root-initramfs.service -%service_del_postun plymouth-start.service -%service_del_postun plymouth-switch-root.service -%service_del_postun plymouth-kexec.service -%service_del_postun plymouth-switch-root-initramfs.service -%service_del_postun plymouth-quit-wait.service -%service_del_postun plymouth-quit.service -%service_del_postun plymouth-halt.service -%service_del_postun plymouth-kexec.service -%service_del_postun plymouth-poweroff.service -%service_del_postun plymouth-quit-wait.service -%service_del_postun plymouth-quit.service -%service_del_postun plymouth-read-write.service -%service_del_postun plymouth-reboot.service -%service_del_postun plymouth-start.service -%service_del_postun plymouth-switch-root-initramfs.service -%service_del_postun plymouth-switch-root.service -%service_del_postun plymouth-poweroff.service -%service_del_postun plymouth-switch-root-initramfs.service -%service_del_postun plymouth-reboot.service -%service_del_postun plymouth-switch-root-initramfs.service -%service_del_postun plymouth-read-write.service -%service_del_postun plymouth-start.service -%service_del_postun systemd-ask-password-plymouth.path -%service_del_postun systemd-ask-password-plymouth.service +%service_del_postun %{plymouth-services} %{?regenerate_initrd_post} %if 0%{?suse_version} > 1500 %service_del_postun_without_restart plymouth-halt.service plymouth-kexec.service plymouth-poweroff.service plymouth-quit-wait.service plymouth-quit.service plymouth-read-write.service plymouth-reboot.service plymouth-start.service