- Update to latest snapshot

0001-populate-initrd-Get-plugin-path-from-plymouth.patch

@@ -1,66 +0,0 @@
-From d633072a713b10092535058488225349f2180e21 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 25 Aug 2009 14:53:31 -0400
-Subject: [PATCH] [populate-initrd] Get plugin path from plymouth
-
-Previously, we'd try to guess the plugin path based
-on the arch of the running process.  That's sort of
-fragile, so better to just install plugins where
-plymouth says it's going to look for them.
----
- scripts/plymouth-populate-initrd.in |   20 +++++---------------
- 1 files changed, 5 insertions(+), 15 deletions(-)
-
-diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
-index 09ccb32..3857197 100755
---- a/scripts/plymouth-populate-initrd.in
-+++ b/scripts/plymouth-populate-initrd.in
-@@ -4,17 +4,7 @@
- 
- [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
- [ -z "$DATADIR" ] && DATADIR="/usr/share"
--[ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
--if [ -z "$LIB" ]; then
--  if $(echo nash-showelfinterp /proc/$$/exe | /sbin/nash --forcequiet | grep -q lib64); then
--    LIB="lib64"
--  else
--    LIB="lib"
--  fi
--fi
--[ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
--[ -z "$BINDIR" ] && BINDIR="/usr/bin"
--[ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
-+[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
- [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
- [ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
- 
-@@ -66,9 +56,9 @@ mkdir -p ${INITRDDIR}${DATADIR}/plymouth/themes
- inst /sbin/plymouthd $INITRDDIR /bin/plymouthd
- inst /bin/plymouth $INITRDDIR
- inst ${DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
--inst ${LIBDIR}/plymouth/text.so $INITRDDIR
-+inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
- inst ${DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
--inst ${LIBDIR}/plymouth/details.so $INITRDDIR
-+inst ${PLYMOUTH_PLUGIN_PATH}/details.so $INITRDDIR
- inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
- inst @RELEASE_FILE@ $INITRDDIR
- 
-@@ -79,12 +69,12 @@ fi
- 
- PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
- 
--if [ ! -f ${LIBDIR}/plymouth/${PLYMOUTH_MODULE_NAME}.so ]; then
-+if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
-     echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
-     exit 1
- fi
- 
--inst ${LIBDIR}/plymouth/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
-+inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
- 
- if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-     for x in ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
--- 
-1.6.4
-

0001-populate-initrd-Try-to-find-inst-more-aggressively.patch

@@ -1,90 +0,0 @@
-From 736822e2f273596e0a7179f5384002903be3d3db Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Wed, 9 Sep 2009 11:26:46 -0400
-Subject: [PATCH] [populate-initrd] Try to find inst more aggressively
-
-We've been using the inst function provided by mkinitrd
-to install plymouth and its dependencies into the initrd
-root, but mkinitrd may not be installed in a dracut world,
-and dracut has its own inst function.
-
-This commit tries getting access to either of them, before
-bailing. At some point we may want to bundle our own inst
-function or get a new flag added to /usr/bin/install to do
-what inst does.
----
- scripts/plymouth-populate-initrd.in |   23 ++++++++++++++++++-----
- 1 files changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
-index 3857197..dd502b9 100755
---- a/scripts/plymouth-populate-initrd.in
-+++ b/scripts/plymouth-populate-initrd.in
-@@ -8,10 +8,23 @@
- [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
- [ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
- 
--if [ -f "${LIBEXECDIR}/initrd-functions" ]; then
--    . "${LIBEXECDIR}/initrd-functions"
--else
--    echo "Couldn't import initrd functions." > /dev/stderr
-+if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
-+
-+    if [ -f "${LIBEXECDIR}/initrd-functions" ]; then
-+        PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${LIBEXECDIR}/initrd-functions"
-+    fi
-+
-+    if [ -f "${DATADIR}/dracut/dracut-functions" ]; then
-+        PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${DATADIR}/dracut/dracut-functions"
-+    fi
-+fi
-+
-+if [ -n "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
-+    source $PLYMOUTH_POPULATE_SOURCE_FUNCTIONS
-+fi
-+
-+if [ " $(type -t inst) " != " function " ]; then
-+    echo "Need 'inst' function, try setting PLYMOUTH_POPULATE_SOURCE_FUNCTIONS to a file that defines it" 1>&2
-     exit 1
- fi
- 
-@@ -48,7 +61,7 @@ while [ $# -gt 0 ]; do
-     esac
-     shift
- done
--set_verbose $verbose
-+set_verbose $verbose || :
- 
- [ -z "$INITRDDIR" ] && usage error
- 
--- 
-1.6.4.2
-
-From 3c2e1453d9652bbe6a29d89edd80664b87ab7271 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Thu, 10 Sep 2009 09:54:44 -0400
-Subject: [PATCH] [populate-initrd] Don't require set_verbose function
-
-If it's not around, define it, so we can use it without error
----
- scripts/plymouth-populate-initrd.in |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
-index dd502b9..dcf2b42 100755
---- a/scripts/plymouth-populate-initrd.in
-+++ b/scripts/plymouth-populate-initrd.in
-@@ -28,6 +28,10 @@ if [ " $(type -t inst) " != " function " ]; then
-     exit 1
- fi
- 
-+if [ " $(type -t set_verbose) " != " function " ]; then
-+    function set_verbose { true; }
-+fi
-+
- function usage() {
-     local output="/dev/stdout"
-     local rc=0
--- 
-1.6.4.2
-

plymouth.spec

@@ -5,7 +5,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.1.2009.11.23%{?dist}
+Release: 0.2009129%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -237,7 +237,7 @@ plugin.
 %setup -q
 
 %build
-%configure --enable-tracing --disable-tests --without-boot-entry \
+%configure --enable-tracing --disable-tests                      \
            --without-default-plugin                              \
            --with-logo=%{_datadir}/pixmaps/system-logo-white.png \
            --with-background-start-color-stop=0x0073B3           \
@@ -454,7 +454,7 @@ fi
 %defattr(-, root, root)
 
 %changelog
-* Mon Nov 23 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.1.2009.11.23
+* Wed Dec 09 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009129
 - Update to latest snapshot
 
 * Tue Sep 29 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.10.05

sources

@@ -1 +1 @@
-ca18866a7f8974b4ef7e66a37113d78e  plymouth-0.8.0.tar.bz2
+6b324b6efa58c54c8c9504bb1ab441b0  plymouth-0.8.0.tar.bz2