From 49212c73c102b43c34141f6804d7ade731f74089 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Thu, 14 May 2009 21:04:38 +0000
Subject: [PATCH] - Update to new snapshot that renames plugins to fix upgrades
 somewhat (bug     499940)

---
 plymouth-set-default-plugin |  2 ++
 plymouth.spec               | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 plymouth-set-default-plugin

diff --git a/plymouth-set-default-plugin b/plymouth-set-default-plugin
new file mode 100644
index 0000000..610f89e
--- /dev/null
+++ b/plymouth-set-default-plugin
@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "plymouth-set-default-plugin has been deprecated by plymouth-set-default-theme"
diff --git a/plymouth.spec b/plymouth.spec
index 6786e90..eda3986 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -5,12 +5,13 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.7.0
-Release: 0.2009.05.14.1%{?dist}
+Release: 0.2009.05.14.2%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
 Source1: boot-duration
 Source2: charge.plymouth
+Source3: plymouth-set-default-plugin
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -171,6 +172,8 @@ Requires: %{name}-plugin-space-flares = %{version}-%{release}
 Requires(post): %{_sbindir}/plymouth-set-default-theme
 Obsoletes: plymouth-plugin-solar <= 0.7.0-0.2009.05.08.2
 Provides: plymouth-plugin-solar = 0.7.0-0.2009.05.08.2
+# We require this to fix upgrades (see bug 499940).
+Requires: plymouth-system-theme
 
 %description theme-solar
 This package contains the "Solar" boot splash theme for
@@ -244,6 +247,10 @@ cp $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png $
 # Drop glow, it's not very Fedora-y
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
 
+# Add compat script for upgrades
+cp $RPM_SOURCE_DIR/plymouth-set-default-plugin $RPM_BUILD_ROOT%{_sbindir}
+chmod +x $RPM_BUILD_ROOT%{_sbindir}/plymouth-set-default-plugin
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -336,6 +343,7 @@ fi
 %files scripts
 %defattr(-, root, root)
 %{_sbindir}/plymouth-set-default-theme
+%{_sbindir}/plymouth-set-default-plugin
 %{_libexecdir}/plymouth/plymouth-update-initrd
 %{_libexecdir}/plymouth/plymouth-populate-initrd