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: 11.%{commitdate}git%{shortcommit}%{?dist}
 License: GPLv2+
 URL: http://www.freedesktop.org/wiki/Software/Plymouth
 Group: System Environment/Base
@@ -246,6 +246,7 @@ sed -i -e 's/spinner/bgrt/g' src/plymouthd.defaults
            --with-background-start-color-stop=0x0073B3           \
            --with-background-end-color-stop=0x00457E             \
            --with-background-color=0x3391cd                      \
+           --with-runtimedir=/run                                \
            --disable-gdm-transition                              \
            --enable-systemd-integration                          \
            --without-system-root-install                         \
@@ -272,7 +273,7 @@ cp $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png $
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
 
 # add in the watermark to spinner and bgrt
-(cd $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/spinner; ln -sf ../charge/watermark.png)
+(cd $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/spinner; ln -sf ../../../pixmaps/fedora-gdm-logo.png watermark.png)
 
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -p -m 644 $RPM_SOURCE_DIR/bootlog $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/bootlog
@@ -305,13 +306,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
@@ -362,7 +361,6 @@ fi
 %{_datadir}/plymouth/themes/text/text.plymouth
 %{_datadir}/plymouth/themes/tribar/tribar.plymouth
 %{_datadir}/plymouth/plymouthd.defaults
-%{_localstatedir}/run/plymouth
 %{_localstatedir}/spool/plymouth
 %{_mandir}/man?/*
 %ghost %{_localstatedir}/lib/plymouth/boot-duration
@@ -452,9 +450,22 @@ fi
 %files system-theme
 
 %changelog
-* Fri Sep 18 2020 Ray Strode <rstrode@redhat.com> - 0.9.4-6.git1688935
+* Tue Feb 22 2022 Ray Strode <rstrode@redhat.com> - 0.9.4-11.git1688935
+- Fix typo in --with-runtimedir argument to actually stop using
+  /var/run and instead use /run instead
+  Resolves: #2056473
+
+* Wed Aug 18 2021 Ray Strode <rstrode@redhat.com> - 0.9.4-10.git1688935
+- Stop using /var/run, just use /run instead
+  Resolves: #1977446
+
+* Thu Jan 28 2021 Ray Strode <rstrode@redhat.com> - 0.9.4-9.git1688935
+- Fix watermark
+  Resolves: #1914930
+
+* Thu Jan 07 2021 Ray Strode <rstrode@redhat.com> - 0.9.4-8.git1688935
 - Add Recommends to pull in plymouth-theme-spinner
-  Resolves: #1880509
+  Resolves: #1907422
 
 * Mon Aug 24 2020 Ray Strode <rstrode@redhat.com> - 0.9.4-5.git1688935
 - Fix typo in poweroff path