From 7c0f571381855fe1f1129cfe1194836754d028ab Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 6 Mar 2009 23:08:10 +0000 Subject: [PATCH] - Fix set default script --- plymouth-0.7.0-fix-set-default.patch | 24 ++++++++++++++++++++++++ plymouth.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 plymouth-0.7.0-fix-set-default.patch diff --git a/plymouth-0.7.0-fix-set-default.patch b/plymouth-0.7.0-fix-set-default.patch new file mode 100644 index 0000000..f59b70b --- /dev/null +++ b/plymouth-0.7.0-fix-set-default.patch @@ -0,0 +1,24 @@ +diff -up plymouth-0.7.0/scripts/plymouth-set-default-plugin.fix-set-default plymouth-0.7.0/scripts/plymouth-set-default-plugin +--- plymouth-0.7.0/scripts/plymouth-set-default-plugin.fix-set-default 2009-03-06 18:05:04.348305491 -0500 ++++ plymouth-0.7.0/scripts/plymouth-set-default-plugin 2009-03-06 18:05:16.368307465 -0500 +@@ -139,6 +139,6 @@ fi + + (cd ${LIBDIR}/plymouth; + ln -sf ${PLUGIN_NAME}.so default.so && \ +- [ $DO_INITRD_REBUILD -ne 0 ] && \ +- $LIBEXECDIR/plymouth/plymouth-update-initrd) ++ ([ $DO_INITRD_REBUILD -ne 0 ] && \ ++ $LIBEXECDIR/plymouth/plymouth-update-initrd) || :) + +diff -up plymouth-0.7.0/scripts/plymouth-set-default-plugin.in.fix-set-default plymouth-0.7.0/scripts/plymouth-set-default-plugin.in +--- plymouth-0.7.0/scripts/plymouth-set-default-plugin.in.fix-set-default 2009-03-06 18:04:48.494054716 -0500 ++++ plymouth-0.7.0/scripts/plymouth-set-default-plugin.in 2009-03-06 18:04:58.738052455 -0500 +@@ -139,6 +139,6 @@ fi + + (cd ${LIBDIR}/plymouth; + ln -sf ${PLUGIN_NAME}.so default.so && \ +- [ $DO_INITRD_REBUILD -ne 0 ] && \ +- $LIBEXECDIR/plymouth/plymouth-update-initrd) ++ ([ $DO_INITRD_REBUILD -ne 0 ] && \ ++ $LIBEXECDIR/plymouth/plymouth-update-initrd) || :) + diff --git a/plymouth.spec b/plymouth.spec index dc56ef9..d536d10 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -5,7 +5,7 @@ Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.7.0 -Release: 0.2009.03.06.1%{?dist} +Release: 0.2009.03.06.2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -19,6 +19,7 @@ Requires(post): plymouth-scripts Requires: initscripts >= 8.83-1 Obsoletes: plymouth-text-and-details-only < %{version}-%{release} +Patch0: plymouth-0.7.0-fix-set-default.patch %description Plymouth provides an attractive graphical boot animation in @@ -149,6 +150,7 @@ Plymouth. It features a blue flamed sun with animated solar flares. %prep %setup -q +%patch0 -p1 -b .fix-set-default %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -319,6 +321,9 @@ fi %defattr(-, root, root) %changelog +* Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06.2 +- Fix set default script + * Fri Mar 6 2009 Ray Strode 0.7.0-0.2009.03.06.1 - more scriptlet changes to move from solar to spinfinity