rpms/plymouth/F-11 plymouth-set-default-plugin, NONE, 1.1 plymouth.spec, 1.129, 1.130

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/plymouth/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29122

Modified Files:
	plymouth.spec 
Added Files:
	plymouth-set-default-plugin 
Log Message:
- Add plymouth-set-default-plugin compat script for upgrades
- Force solar to bring in system-plugin to work around comps snafu
  (bug 499940)



--- NEW FILE plymouth-set-default-plugin ---
#!/bin/sh
echo "plymouth-set-default-plugin has been deprecated by plymouth-set-default-theme"


Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/F-11/plymouth.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- plymouth.spec	14 May 2009 18:03:56 -0000	1.129
+++ plymouth.spec	14 May 2009 19:54:46 -0000	1.130
@@ -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 = 
 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/t
 # 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
 
@@ -402,6 +410,11 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Thu May 14 2009 Ray Strode <rstrode at redhat.com> 0.7.0-0.2009.05.14.2
+- Add plymouth-set-default-plugin compat script for upgrades
+- Force solar to bring in system-plugin to work around comps snafu
+  (bug 499940)
+
 * Thu May 14 2009 Ray Strode <rstrode at redhat.com> 0.7.0-0.2009.05.14.1
 - Update to new snapshot that renames plugins to fix upgrades
   somewhat (bug 499940)