- Don't require /bin/plymouth before it's installed (bug 468925)

This commit is contained in:
Ray Strode 2008-10-29 00:00:30 +00:00
parent 214d7aeb5e
commit 9a6fb0e27f
2 changed files with 19 additions and 2 deletions

View File

@ -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"

View File

@ -5,7 +5,7 @@
Summary: Plymouth Graphical Boot Animation and Logger Summary: Plymouth Graphical Boot Animation and Logger
Name: plymouth Name: plymouth
Version: 0.6.0 Version: 0.6.0
Release: 0.2008.10.27.6%{?dist} Release: 0.2008.10.27.7%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 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(post): plymouth-scripts
Requires: initscripts >= 8.83-1 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 %description
Plymouth provides an attractive graphical boot animation in Plymouth provides an attractive graphical boot animation in
@ -153,6 +154,7 @@ where the graphical plugin's dependencies are undesirable.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .force-raw-mode %patch0 -p1 -b .force-raw-mode
%patch1 -p1 -b .dont-require-bin-plymouth
%build %build
%configure --enable-tracing --disable-tests --without-boot-entry \ %configure --enable-tracing --disable-tests --without-boot-entry \
@ -301,6 +303,9 @@ fi
%defattr(-, root, root) %defattr(-, root, root)
%changelog %changelog
* Tue Oct 28 2008 Ray Strode <rstrode@redhat.com> 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 <rstrode@redhat.com> 0.6.0-0.2008.10.27.6 * Tue Oct 28 2008 Ray Strode <rstrode@redhat.com> 0.6.0-0.2008.10.27.6
- Force raw mode for keyboard input with solar and fade-in - Force raw mode for keyboard input with solar and fade-in
(bug 468880) (bug 468880)