Accepting request 917854 from home:qzhao:branches:Base:System

- Add plymouth-set-default-theme-suse-branding.patch: set plymouth's 
  default theme to openSUSE/SUSE branding assigned style to avoid 
  screen mass(bsc#1189613).
- Update plymouth.spec: Rearrange plymouth sub packages dependencies 
  to avoid installation failures due to a race installation state 
  which will leading theme display fault(1189613).

OBS-URL: https://build.opensuse.org/request/show/917854
OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=307

plymouth-set-default-theme-suse-branding.patch

@@ -0,0 +1,146 @@
+diff -Nura plymouth-0.9.5~git20210406.e554475/scripts/plymouth-set-default-theme.in plymouth-0.9.5~git20210406.e554475_new/scripts/plymouth-set-default-theme.in
+--- plymouth-0.9.5~git20210406.e554475/scripts/plymouth-set-default-theme.in	2021-09-07 21:20:35.469101952 +0800
++++ plymouth-0.9.5~git20210406.e554475_new/scripts/plymouth-set-default-theme.in	2021-09-07 21:51:07.618708601 +0800
+@@ -6,6 +6,7 @@
+ [ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@"
+ [ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@"
+ [ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@"
++[ -z "$OS" ] && OS=`cat /etc/os-release |grep ^NAME= |cut -d'=' -f2`
+ if [ -z "$PLYMOUTH_PLUGIN_PATH" ]; then
+     if [ -z "$LIB" ]; then
+         PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
+@@ -56,27 +57,27 @@
+                ')
+ }
+ 
+-function get_default_theme ()
++function get_current_theme ()
+ {
+-        if [ -f /etc/plymouth/plymouthd.conf ]; then
++        if [ -z "$THEME_NAME" -a -r "${PLYMOUTH_CONFDIR}/plymouthd.conf" ]; then
+                 THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_CONFDIR}/plymouthd.conf)
+-        elif [ -f /usr/share/plymouth/plymouthd.defaults ]; then
+-                THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defaults)
+         fi
+ 
+-        if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then
++        if [ -z "$THEME_NAME" -a -r "${PLYMOUTH_POLICYDIR}/plymouthd.defaults" ]; then
+                 THEME_NAME=$(read_theme_name_from_file ${PLYMOUTH_POLICYDIR}/plymouthd.defaults)
+         fi
+ 
+-        if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" \
+-             -a -L "${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth" ]; then
+-                THEME_NAME=$(basename "$(readlink ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth)" .plymouth)
+-        fi
+-        if [ -z "$THEME_NAME" -o ! -r "${PLYMOUTH_DATADIR}/plymouth/themes/$THEME_NAME/$THEME_NAME.plymouth" ]; then
+-                THEME_NAME="text"
++        if [ -n "$THEME_NAME" ] ; then
++		if [ $DO_INITRD_REBUILD -eq 0 ]; then
++                        echo $THEME_NAME
++		fi
++                return 0;
++        else
++                echo "Failed: No default theme found."
++                return 1;
+         fi
+ 
+-        echo $THEME_NAME
++
+ }
+ 
+ DO_RESET=0
+@@ -163,7 +164,7 @@
+ fi
+ 
+ if [ $DO_RESET -eq 0 ] && [ $DO_INITRD_REBUILD -eq 0 ] && [ -z $THEME_NAME ]; then
+-        get_default_theme
++        get_current_theme
+         exit $?
+ fi
+ 
+@@ -173,27 +174,30 @@
+ fi
+ 
+ if [ $DO_RESET -ne 0 ]; then
+-        if [ -f ${PLYMOUTH_CONFDIR}/plymouthd.conf ]; then
+-                 sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+-                 exit $?
+-         elif [ -f ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ]; then
+-                 cp ${PLYMOUTH_DATADIR}/plymouth/plymouthd.defauts ${PLYMOUTH_CONFDIR}/plymouthd.conf
+-                 sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+-                 exit $?
+-         else
+-                 exit 0
+-         fi
++        if [[ -z "$THEME_NAME" ]] && [[ "$OS" == "SLED" ]] || [[ "$OS" == "SLES" ]] ; then
++                THEME_NAME="SLE"
++
++        elif [[ -z "$THEME_NAME" ]] && [[ "$OS" == *"openSUSE Tumbleweed"* ]] ; then
++                THEME_NAME="bgrt"
++
++        elif [[ -z "$THEME_NAME" ]] && [[ "$OS" == *"openSUSE Leap"* ]] ; then
++                THEME_NAME="opensuse"
++        fi
++fi
++
++if [[ -z "$THEME_NAME" ]] ; then
++        get_current_theme
+ fi
+ 
+ if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
+-        echo "${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does not exist" >&2
++        echo "Failed: ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does not exist" >&2
+         exit 1
+ fi
+ 
+ MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
+ 
+ if [ ! -e ${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so ]; then
+-        echo "${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so does not exist" >&2
++        echo "Failed: ${PLYMOUTH_PLUGIN_PATH}${MODULE_NAME}.so does not exist" >&2
+         exit 1
+ fi
+ 
+@@ -201,6 +205,8 @@
+ 
+ [ -d ${PLYMOUTH_CONFDIR} ] || mkdir -p ${PLYMOUTH_CONFDIR}
+ grep -q '^[[]Daemon[]]' ${PLYMOUTH_CONFDIR}/plymouthd.conf 2> /dev/null || echo '[Daemon]' >> ${PLYMOUTH_CONFDIR}/plymouthd.conf
++sed -i -e '/^\#\[Daemon\][[:blank:]]*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
++sed -i -e '/^#Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_CONFDIR}/plymouthd.conf
+ 
+diff -Nura plymouth-0.9.5~git20210406.e554475/scripts/plymouth-update-initrd plymouth-0.9.5~git20210406.e554475_new/scripts/plymouth-update-initrd
+--- plymouth-0.9.5~git20210406.e554475/scripts/plymouth-update-initrd	2021-04-06 19:53:40.000000000 +0800
++++ plymouth-0.9.5~git20210406.e554475_new/scripts/plymouth-update-initrd	2021-09-07 21:51:02.107700743 +0800
+@@ -1,2 +1,3 @@
+ #!/bin/bash
+-dracut -f
++echo "Regenerating initrd ..."
++dracut -qf
+diff -Nura plymouth-0.9.5~git20210406.e554475/src/main.c plymouth-0.9.5~git20210406.e554475_new/src/main.c
+--- plymouth-0.9.5~git20210406.e554475/src/main.c	2021-04-06 19:53:40.000000000 +0800
++++ plymouth-0.9.5~git20210406.e554475_new/src/main.c	2021-09-07 21:21:36.752188499 +0800
+@@ -462,20 +462,9 @@
+         }
+ 
+         if (state->boot_splash == NULL) {
+-                ply_trace ("Trying old scheme for default splash");
+-                state->boot_splash = show_theme (state, PLYMOUTH_THEME_PATH "default.plymouth");
+-        }
+-
+-        if (state->boot_splash == NULL) {
+                 ply_trace ("Could not start default splash screen,"
+-                           "showing text splash screen");
+-                state->boot_splash = show_theme (state, PLYMOUTH_THEME_PATH "text/text.plymouth");
+-        }
+-
+-        if (state->boot_splash == NULL) {
+-                ply_trace ("Could not start text splash screen,"
+-                           "showing built-in splash screen");
+-                state->boot_splash = show_theme (state, NULL);
++                           "showing details splash screen");
++                state->boot_splash = show_theme (state, PLYMOUTH_THEME_PATH "details/details.plymouth");
+         }
+ 
+         if (state->boot_splash == NULL) {

plymouth.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep  6 08:42:26 UTC 2021 - Cliff Zhao <qzhao@suse.com>
+
+- Add plymouth-set-default-theme-suse-branding.patch: set plymouth's 
+  default theme to openSUSE/SUSE branding assigned style to avoid 
+  screen mass(bsc#1189613).
+- Update plymouth.spec: Rearrange plymouth sub packages dependencies 
+  to avoid installation failures due to a race installation state 
+  which will leading theme display fault(1189613).
+
 -------------------------------------------------------------------
 Tue Aug 31 14:13:20 UTC 2021 - Cliff Zhao <qzhao@suse.com>
 
@@ -1544,4 +1554,3 @@ Wed Dec 22 10:20:54 UTC 2010 - seife+obs@b1-systems.com
 Wed Dec  8 22:44:13 CET 2010 - jeffm@suse.de
 
 - Initial packaging.
-

plymouth.spec

@@ -47,11 +47,13 @@ Patch6:         plymouth-disable-fedora-logo.patch
 Patch7:         plymouth-only_use_fb_for_cirrus_bochs.patch
 # PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 qzhao@suse.com -- Keep the plymouth-start.service KillMode=none.
 Patch8:         plymouth-keep-KillMode-none.patch
+# PATCH-FIX-OPENSUSE plymouth-set-default-theme-suse-branding.patch bsc#1189613 qzhao@suse.com -- set plymouth's default theme to openSUSE/SUSE branding assigned style to avoid screen mass.
+Patch9:         plymouth-set-default-theme-suse-branding.patch
 # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
 Patch1000:      0001-Add-label-ft-plugin.patch
 # PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
 Patch1001:      0002-Install-label-ft-plugin-into-initrd-if-available.patch
-#uo PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
+# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
 Patch1002:      0003-fix_null_deref.patch
 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
@@ -79,13 +81,27 @@ BuildRequires:  pkgconfig(systemd) >= 186
 %if %{with x11_renderer}
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.14.0
 %endif
+%if 0%{?is_opensuse}
+Requires:       %{name}-branding-openSUSE
+Requires:       %{name}-plugin-two-step = %{version}
+Requires:       %{name}-theme-bgrt = %{version}
+Requires:       %{name}-theme-spinner = %{version}
+%else
+Requires:       %{name}-branding-SLE
+Requires:       %{name}-plugin-scripts = %{version}
+Suggests:       %{name}-theme-bgrt = %{version}
+Suggests:       %{name}-theme-spinner = %{version}
+%endif
 Recommends:     %{name}-lang
-Requires:       %{name}-branding
+Requires:       libdrm2
+Requires:       libply%{soversion} = %{version}
+Requires:       libply-boot-client%{soversion} = %{version}
+Requires:       libply-splash-core%{soversion} = %{version}
+Requires:       libudev1
 Requires:       systemd >= 186
-Requires(post): coreutils
+Suggests:       %{name}-theme-fade-in
-Requires(post): plymouth-scripts = %{version}
+Suggests:       %{name}-theme-spinfinity
-Requires(postun):coreutils
+Suggests:       %{name}-theme-tribar
-Suggests:       plymouth-plugin-label
 Provides:       bootsplash = 3.5
 Obsoletes:      bootsplash < 3.5
 Provides:       systemd-plymouth = 44-10.2
@@ -100,14 +116,17 @@ after boot.
 
 %package -n libply-boot-client%{soversion}
 Summary:        Plymouth core library
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
+Requires:       libply%{soversion} = %{version}
 
 %description -n libply-boot-client%{soversion}
 This package contains the libply-boot-client library used by Plymouth.
 
 %package -n libply-splash-core%{soversion}
 Summary:        Plymouth core library
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
+Requires:       libply%{soversion} = %{version}
+Requires:       libudev1
 
 %description -n libply-splash-core%{soversion}
 This package contains the libply-splash-core library
@@ -115,8 +134,11 @@ used by graphical Plymouth splashes.
 
 %package -n libply-splash-graphics%{soversion}
 Summary:        Plymouth graphics libraries
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 BuildRequires:  libpng-devel
+Requires:       libply%{soversion} = %{version}
+Requires:       libply-splash-core%{soversion} = %{version}
+Requires:       libpng16-16
 
 %description -n libply-splash-graphics%{soversion}
 This package contains the libply-splash-graphics library
@@ -124,8 +146,7 @@ used by graphical Plymouth splashes.
 
 %package -n libply%{soversion}
 Summary:        Plymouth core library
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
-Requires:       libply-boot-client%{soversion} = %{version}
 
 %description -n libply%{soversion}
 This package contains the libply library used by Plymouth.
@@ -161,8 +182,7 @@ and headers needed to develop 3rd party splash plugins for Plymouth.
 %package dracut
 Summary:        Plymouth related utilities for dracut
 Group:          System/Base
-Requires:       %{name} = %{version}
+Requires:       coreutils
-Supplements:    packageand(plymouth:dracut)
 
 %description dracut
 This package contains utilities that integrate dracut with Plymouth
@@ -179,11 +199,12 @@ behavior on environments with a valid DISPLAY.
 %package scripts
 Summary:        Plymouth related scripts
 Group:          System/Base
+Requires:       %{name}-dracut
 Requires:       awk
+Requires:       coreutils
 Requires:       dracut
 Requires:       grep
 Requires:       sed
-Requires(pre):  %{name} = %{version}
 BuildArch:      noarch
 
 %description scripts
@@ -193,6 +214,11 @@ the system.
 %package plugin-label
 Summary:        Plymouth label plugin
 Group:          System/Base
+Requires:       libcairo2
+Requires:       libfontconfig1
+Requires:       libfreetype6
+Requires:       libpango-1_0-0
+Requires:       libply%{soversion} = %{version}
 Requires:       libply-splash-graphics%{soversion} = %{version}
 
 %description plugin-label
@@ -217,6 +243,8 @@ Group:          System/Base
 Requires:       libply%{soversion} = %{version}
 Requires:       libply-splash-core%{soversion} = %{version}
 Requires:       libply-splash-graphics%{soversion} = %{version}
+Requires:       libpng16-16
+Requires:       libudev1
 
 %description plugin-fade-throbber
 This package contains the "Fade-In" boot splash plugin for
@@ -226,10 +254,11 @@ while other images pulsate around during system boot up.
 %package plugin-space-flares
 Summary:        Plymouth "space-flares" plugin
 Group:          System/Base
-Requires:       %{name}-plugin-label = %{version}
 Requires:       libply%{soversion} = %{version}
 Requires:       libply-splash-core%{soversion} = %{version}
 Requires:       libply-splash-graphics%{soversion} = %{version}
+Requires:       libpng16-16
+Requires:       libudev1
 
 %description plugin-space-flares
 This package contains the "space-flares" boot splash plugin for
@@ -241,7 +270,8 @@ Group:          System/Base
 Requires:       libply%{soversion} = %{version}
 Requires:       libply-splash-core%{soversion} = %{version}
 Requires:       libply-splash-graphics%{soversion} = %{version}
-Requires:       plymouth-plugin-label = %{version}
+Requires:       libpng16-16
+Requires:       libudev1
 
 %description plugin-two-step
 This package contains the "two-step" boot splash plugin for
@@ -255,6 +285,7 @@ Group:          System/Base
 Requires:       libply%{soversion} = %{version}
 Requires:       libply-splash-core%{soversion} = %{version}
 Requires:       libply-splash-graphics%{soversion} = %{version}
+Requires:       libudev1
 
 %description plugin-script
 This package contains the "script" boot splash plugin for
@@ -267,7 +298,7 @@ Summary:        Plymouth "script" plugin
 Group:          System/Base
 Requires:       libply%{soversion} = %{version}
 Requires:       libply-splash-core%{soversion} = %{version}
-Requires:       libply-splash-graphics%{soversion} = %{version}
+Requires:       libudev1
 
 %description plugin-tribar
 This package contains the "tribar" boot splash plugin for
@@ -275,12 +306,25 @@ Plymouth. It features an extensible, scriptable boot splash
 language that simplifies the process of designing custom
 boot splash themes.
 
+%package theme-bgrt
+Summary:        Plymouth "bgrt" theme
+Group:          System/Base
+Requires:       %{name}-plugin-label = %{version}
+Requires:       %{name}-plugin-two-step = %{version}
+%if !0%{?is_opensuse}
+Enhances:       %{name} = %{version}
+%endif
+BuildArch:      noarch
+
+%description theme-bgrt
+This package contains the "bgrt" boot splash theme for
+Plymouth.
+
 %package theme-fade-in
 Summary:        Plymouth "Fade-In" theme
 Group:          System/Base
 Requires:       %{name}-plugin-fade-throbber = %{version}
-Requires:       plymouth-plugin-label = %{version}
+Enhances:       %{name} = %{version}
-Requires(post): %{name}-scripts
 BuildArch:      noarch
 
 %description theme-fade-in
@@ -288,11 +332,26 @@ This package contains the "Fade-In" boot splash theme for
 Plymouth. It features a centered logo that fades in and out
 while stars twinkle around the logo during system boot up.
 
+%package theme-script
+Summary:        Plymouth "Script" theme
+Group:          System/Base
+Requires:       %{name}-plugin-script = %{version}
+%if 0%{?is_opensuse}
+Enhances:       %{name} = %{version}
+%endif
+BuildArch:      noarch
+
+%description theme-script
+This package contains the "script" boot splash theme for
+Plymouth. It is a simple example theme the uses the "script"
+plugin.
+
 %package theme-spinfinity
 Summary:        Plymouth "Spinfinity" theme
 Group:          System/Base
-Requires(post): %{name}-scripts
+Requires:       %{name}-plugin-label = %{version}
-Requires(pre):  %{name}
+Requires:       %{name}-plugin-two-step = %{version}
+Enhances:       %{name} = %{version}
 BuildArch:      noarch
 
 %description theme-spinfinity
@@ -303,8 +362,11 @@ spins in the shape of an infinity sign.
 %package theme-spinner
 Summary:        Plymouth "Spinner" theme
 Group:          System/Base
+Requires:       %{name}-plugin-label = %{version}
 Requires:       %{name}-plugin-two-step = %{version}
-Requires(post): %{name}-scripts
+%if !0%{?is_opensuse}
+Enhances:       %{name} = %{version}
+%endif
 BuildArch:      noarch
 
 %description theme-spinner
@@ -314,8 +376,8 @@ Plymouth.
 %package theme-solar
 Summary:        Plymouth "Solar" theme
 Group:          System/Base
+Requires:       %{name}-plugin-label = %{version}
 Requires:       %{name}-plugin-space-flares = %{version}
-Requires(post): %{name}-scripts
 BuildArch:      noarch
 
 %description theme-solar
@@ -326,38 +388,13 @@ Plymouth. It features a blue flamed sun with animated solar flares.
 Summary:        Plymouth "Tribar" theme
 Group:          System/Base
 Requires:       %{name}-plugin-tribar = %{version}
-Requires(post): %{name}-scripts
+Enhances:       %{name} = %{version}
 BuildArch:      noarch
 
 %description theme-tribar
 This package contains the "Tribar" boot splash theme for
 Plymouth
 
-%package theme-script
-Summary:        Plymouth "Script" theme
-Group:          System/Base
-Requires:       %{name}-plugin-script = %{version}
-Requires(post): %{name}-scripts
-BuildArch:      noarch
-
-%description theme-script
-This package contains the "script" boot splash theme for
-Plymouth. It is a simple example theme the uses the "script"
-plugin.
-
-%package theme-bgrt
-Summary:        Plymouth "bgrt" theme
-# Uses images from spinner theme
-Group:          System/Base
-Requires:       %{name}-plugin-two-step = %{version}
-Requires:       %{name}-theme-spinner = %{version}
-Requires(post): %{name}-scripts
-BuildArch:      noarch
-
-%description theme-bgrt
-This package contains the "bgrt" boot splash theme for
-Plymouth.
-
 %prep
 %setup -q
 %autopatch -p1
@@ -382,7 +419,8 @@ autoreconf -ivf
            --with-background-end-color-stop=0x4EA65C             \
            --with-background-color=0x3391cd                      \
            --without-rhgb-compat-link                            \
-           --without-system-root-install
+           --without-system-root-install                         \
+           POLICY_DIR='/usr/share/plymouth/'
 
 make %{?_smp_mflags}
 
@@ -418,25 +456,32 @@ rm -f  %{buildroot}%{_datadir}/plymouth/plymouthd.conf
 %find_lang %{name}
 
 %post
-%{?regenerate_initrd_post}
 if [ ! -e /.buildenv ]; then
    [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
+
+   plymouth-set-default-theme -r
+   if [ "$?" -eq 0 ] && [ "$1" -eq 0 ]; then
+        plymouth-set-default-theme -R
+   fi
 fi
 
 %postun
-%{?regenerate_initrd_post}
 %if 0%{?suse_version} > 1500
-%service_del_postun_without_restart
+    %service_del_postun_without_restart
 %else
-%systemd_postun
+    %systemd_postun
 %endif
+
 if [ $1 -eq 0 ]; then
     rm -f %{_libdir}/plymouth/default.so
     rm -f /boot/initrd-plymouth.img
 fi
 
 %posttrans
-%{?regenerate_initrd_posttrans}
+plymouth-set-default-theme -r
+if [ $? -eq 0 ]; then
+        plymouth-set-default-theme -R
+fi
 
 %if 0%{?suse_version} > 1500
 %ldconfig_scriptlets -n libply-boot-client%{soversion}
@@ -454,72 +499,6 @@ fi
 %postun -n libply%{soversion} -p /sbin/ldconfig
 %endif
 
-%post theme-spinfinity
-if [ $1 -eq 1 ]; then
-  set -x
-  export LIB=%{_libdir}
-  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
-  if [ "$OTHEME" = "text" ]; then
-     if [ ! -e /.buildenv ]; then
-       %{_sbindir}/plymouth-set-default-theme -R spinfinity
-     else
-       %{_sbindir}/plymouth-set-default-theme spinfinity
-     fi
-  fi
-fi
-
-%postun theme-spinfinity
-if [ $1 -eq 0 ]; then
-    export LIB=%{_libdir}
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "spinfinity" ]; then
-        %{_sbindir}/plymouth-set-default-theme -R --reset
-    fi
-fi
-
-%post theme-fade-in
-if [ $1 -eq 1 ]; then
-  set -x
-  export LIB=%{_libdir}
-  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
-  if [ "$OTHEME" = "text" ]; then
-     if [ ! -e /.buildenv ]; then
-       %{_sbindir}/plymouth-set-default-theme -R fade-in
-     else
-       %{_sbindir}/plymouth-set-default-theme fade-in
-     fi
-  fi
-fi
-
-%postun theme-fade-in
-if [ $1 -eq 0 ]; then
-    export LIB=%{_libdir}
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "fade-in" ]; then
-        %{_sbindir}/plymouth-set-default-theme -R --reset
-    fi
-fi
-
-%post theme-solar
-if [ $1 -eq 1 ]; then
-  set -x
-  export LIB=%{_libdir}
-  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
-  if [ "$OTHEME" = "text" ]; then
-     if [ ! -e /.buildenv ]; then
-       %{_sbindir}/plymouth-set-default-theme -R solar
-     else
-       %{_sbindir}/plymouth-set-default-theme solar
-     fi
-  fi
-fi
-
-%postun theme-solar
-if [ $1 -eq 0 ]; then
-    export LIB=%{_libdir}
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" = "solar" ]; then
-        %{_sbindir}/plymouth-set-default-theme -R --reset
-    fi
-fi
-
 %files
 %dir %{_sysconfdir}/plymouth
 %ghost %{_sysconfdir}/plymouth/plymouthd.conf