diff --git a/plymouth-0.6.0-dont-require-bin-plymouth.patch b/plymouth-0.6.0-dont-require-bin-plymouth.patch new file mode 100644 index 0000000..b0607d2 --- /dev/null +++ b/plymouth-0.6.0-dont-require-bin-plymouth.patch @@ -0,0 +1,12 @@ +diff -up plymouth-0.6.0/scripts/plymouth-set-default-plugin.in.dont-require-bin-plymouth plymouth-0.6.0/scripts/plymouth-set-default-plugin.in +--- plymouth-0.6.0/scripts/plymouth-set-default-plugin.in.dont-require-bin-plymouth 2008-10-28 19:55:56.000000000 -0400 ++++ plymouth-0.6.0/scripts/plymouth-set-default-plugin.in 2008-10-28 19:57:10.000000000 -0400 +@@ -4,7 +4,7 @@ set -e + + [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec" + [ -z "$DATADIR" ] && DATADIR="/usr/share" +-[ -z "$LIB" ] && $(echo nash-showelfinterp @plymouthclientdir@/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" ++[ -z "$LIB" ] && $(echo nash-showelfinterp /proc/$$/exe | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib" + [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB" + [ -z "$BINDIR" ] && BINDIR="/usr/bin" + diff --git a/plymouth.spec b/plymouth.spec index f5fdfe0..35f3805 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -5,7 +5,7 @@ Summary: Plymouth Graphical Boot Animation and Logger Name: plymouth Version: 0.6.0 -Release: 0.2008.10.27.6%{?dist} +Release: 0.2008.10.27.7%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -20,7 +20,8 @@ Requires: system-plymouth-plugin >= %{version}-%{release} Requires(post): plymouth-scripts Requires: initscripts >= 8.83-1 -Patch0: plymouth-0.6.0-force-raw-mode.patch +Patch0: plymouth-0.6.0-force-raw-mode.patch +Patch1: plymouth-0.6.0-dont-require-bin-plymouth.patch %description Plymouth provides an attractive graphical boot animation in @@ -153,6 +154,7 @@ where the graphical plugin's dependencies are undesirable. %prep %setup -q %patch0 -p1 -b .force-raw-mode +%patch1 -p1 -b .dont-require-bin-plymouth %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -301,6 +303,9 @@ fi %defattr(-, root, root) %changelog +* Tue Oct 28 2008 Ray Strode 0.6.0-0.2008.10.27.7 +- Don't require /bin/plymouth before it's installed (bug 468925) + * Tue Oct 28 2008 Ray Strode 0.6.0-0.2008.10.27.6 - Force raw mode for keyboard input with solar and fade-in (bug 468880)