From bad12ca4c312fd4e0ae4e6053a0ab5be68bbaa66 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Thu, 10 Jul 2008 01:36:13 +0000
Subject: [PATCH] - Use a new heuristic for finding libdir, since the old one
 falls over on     ia64

---
 find-right-libdir.patch | 47 +++++++++++++++++++++++++++++++++++++++++
 plymouth.spec           |  9 ++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 find-right-libdir.patch

diff --git a/find-right-libdir.patch b/find-right-libdir.patch
new file mode 100644
index 0000000..c81bdb0
--- /dev/null
+++ b/find-right-libdir.patch
@@ -0,0 +1,47 @@
+commit d8086a93a37e1e76c7b544a13faef13683c79b62
+Author: Ray Strode <rstrode@redhat.com>
+Date:   Wed Jul 9 21:31:20 2008 -0400
+
+    Compute libdir using yet a different heuristic
+    
+    The previous one falls over for ia64
+
+diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
+index 033ca06..e4ccded 100755
+--- a/scripts/plymouth-populate-initrd.in
++++ b/scripts/plymouth-populate-initrd.in
+@@ -7,7 +7,7 @@ set -e
+ [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
+ [ -z "$DATADIR" ] && DATADIR="/usr/share"
+ [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
+-[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib"
++[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
+ [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
+ [ -z "$BINDIR" ] && BINDIR="/usr/bin"
+ [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
+diff --git a/scripts/plymouth-set-default-plugin b/scripts/plymouth-set-default-plugin
+index a2ac8fd..3edee7a 100755
+--- a/scripts/plymouth-set-default-plugin
++++ b/scripts/plymouth-set-default-plugin
+@@ -4,7 +4,7 @@ set -e
+ 
+ [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
+ [ -z "$DATADIR" ] && DATADIR="/usr/share"
+-[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib"
++[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
+ [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
+ [ -z "$BINDIR" ] && BINDIR="/usr/bin"
+ 
+diff --git a/scripts/plymouth-update-initrd.in b/scripts/plymouth-update-initrd.in
+index 2d37bcf..b8bc8f8 100755
+--- a/scripts/plymouth-update-initrd.in
++++ b/scripts/plymouth-update-initrd.in
+@@ -8,7 +8,7 @@ set -e
+ [ -z "$DATADIR" ] && DATADIR="/usr/share"
+ [ -z "$INITRD" ] && INITRD="/boot/initrd-$(/sbin/grubby --default-kernel | sed 's/.*vmlinuz-//g').img"
+ [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
+-[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib"
++[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
+ [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
+ [ -z "$BINDIR" ] && BINDIR="/usr/bin"
+ [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
diff --git a/plymouth.spec b/plymouth.spec
index 2e9e5ad..dffe617 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -12,11 +12,11 @@ Obsoletes: rhgb < 1:10.0.0
 Provides: rhgb = 1:10.0.0
 
 Requires: system-logos >= 9.0.1
-Requires: elfutils
 Requires: system-plymouth-plugin >= %{version}-%{release}
 
 Patch0: plymouth-0.5.0-fix-ppc.patch
 Patch1: restore-color-palette.patch
+Patch2: find-right-libdir.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -71,6 +71,7 @@ spins in the shape of an infinity sign.
 
 %patch0 -p1 -b .fix-ppc
 %patch1 -p1 -b .restore-color-palette
+%patch2 -p1 -b .find-right-libdir
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -176,6 +177,10 @@ fi
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Wed Jul  9 2008 Ray Strode <rstrode@redhat.com> - 0.5.0-5
+- Use a new heuristic for finding libdir, since the old
+  one falls over on ia64
+
 * Wed Jul  9 2008 Ray Strode <rstrode@redhat.com> - 0.5.0-4
 - add ctrl-r to rotate text color palette back to stock values