diff --git a/plymouth-allow-passing-plugin.patch b/plymouth-allow-passing-plugin.patch new file mode 100644 index 0000000..741e081 --- /dev/null +++ b/plymouth-allow-passing-plugin.patch @@ -0,0 +1,41 @@ +diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in +index e9db1b9..cc640e5 100755 +--- a/scripts/plymouth-populate-initrd.in ++++ b/scripts/plymouth-populate-initrd.in +@@ -10,6 +10,7 @@ + [ -z "$BINDIR" ] && BINDIR="/usr/bin" + [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup" + [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@" ++[ -z "$PLYMOUTH_PLUGIN_NAME" ] && PLYMOUTH_PLUGIN_NAME=$(plymouth-set-default-plugin) + + if [ -f "${LIBEXECDIR}/initrd-functions" ]; then + . "${LIBEXECDIR}/initrd-functions" +@@ -63,22 +64,20 @@ inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR + inst /etc/system-release $INITRDDIR + mkdir -p ${INITRDDIR}${DATADIR}/plymouth + +-PLUGIN_NAME=$(plymouth-set-default-plugin) +- +-if [ -z "$PLUGIN_NAME" ]; then ++if [ -z "$PLYMOUTH_PLUGIN_NAME" ]; then + echo "No default plymouth plugin is set" > /dev/stderr + exit 1 + fi + +-if [ ! -f ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ]; then +- echo "The default plymouth plugin (${PLUGIN_NAME}) doesn't exist" > /dev/stderr ++if [ ! -f ${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN_NAME}.so ]; then ++ echo "The default plymouth plugin (${PLYMOUTH_PLUGIN_NAME}) doesn't exist" > /dev/stderr + exit 1 + fi + +-inst ${LIBDIR}/plymouth/${PLUGIN_NAME}.so $INITRDDIR ++inst ${LIBDIR}/plymouth/${PLYMOUTH_PLUGIN_NAME}.so $INITRDDIR + inst ${LIBDIR}/plymouth/default.so $INITRDDIR +-if [ -d ${DATADIR}/plymouth/${PLUGIN_NAME} ]; then +- for x in ${DATADIR}/plymouth/${PLUGIN_NAME}/* ; do ++if [ -d ${DATADIR}/plymouth/${PLYMOUTH_PLUGIN_NAME} ]; then ++ for x in ${DATADIR}/plymouth/${PLYMOUTH_PLUGIN_NAME}/* ; do + [ ! -f "$x" ] && break + inst $x $INITRDDIR + done diff --git a/plymouth.spec b/plymouth.spec index 3546e7c..91cbba3 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -5,10 +5,11 @@ Summary: Plymouth Graphical Boot Animation and Logger Name: plymouth Version: 0.6.0 -Release: 0.2008.10.30.3%{?dist} +Release: 0.2008.10.30.4%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 +Patch0: plymouth-allow-passing-plugin.patch URL: http://freedesktop.org/software/plymouth/releases BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -150,6 +151,7 @@ where the graphical plugin's dependencies are undesirable. %prep %setup -q +%patch0 -p1 %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -298,6 +300,9 @@ fi %defattr(-, root, root) %changelog +* Mon Nov 3 2008 Jeremy Katz - 0.6.0-0.2008.10.30.4 +- Allow pre-setting the default plugin when calling plymouth-populate-initrd + * Fri Oct 31 2008 Ray Strode 0.6.0-0.2008.10.30.3 - Add pango minimum version to buildrequires