From 9cd2face6557ad385aa48a8b0f50c0229a49cbd9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 26 2020 06:10:11 +0000
Subject: import plymouth-0.9.4-7.20200615git1e36e30.el8


---

diff --git a/SPECS/plymouth.spec b/SPECS/plymouth.spec
index c5dbee4..af9c636 100644
--- a/SPECS/plymouth.spec
+++ b/SPECS/plymouth.spec
@@ -10,7 +10,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.9.4
-Release: 6.%{commitdate}git%{shortcommit}%{?dist}
+Release: 7.%{commitdate}git%{shortcommit}%{?dist}
 License: GPLv2+
 URL: http://www.freedesktop.org/wiki/Software/Plymouth
 Group: System Environment/Base
@@ -305,13 +305,11 @@ if [ $1 -eq 0 ]; then
     fi
 fi
 
-%post theme-spinner
+%triggerin -n %{name}-theme-spinner -- %{name}-theme-charge > 0.9.4-5
 export PLYMOUTH_PLUGIN_PATH=%{_libdir}/plymouth/
 # On upgrades replace charge with the new bgrt default
-if [ $1 -eq 2 ]; then
-    if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "charge" ]; then
-        %{_sbindir}/plymouth-set-default-theme bgrt
-    fi
+if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "charge" ]; then
+    %{_sbindir}/plymouth-set-default-theme bgrt
 fi
 
 %postun theme-spinner
@@ -452,6 +450,10 @@ fi
 %files system-theme
 
 %changelog
+* Fri Sep 25 2020 Ray Strode <rstrode@redhat.com> - 0.9.4-7.git1688935
+- Fix scriptlets to make sure "bgrt" gets set by default
+  Related: #1880509
+
 * Fri Sep 18 2020 Ray Strode <rstrode@redhat.com> - 0.9.4-6.git1688935
 - Add Recommends to pull in plymouth-theme-spinner
   Resolves: #1880509