remove cartoonbuilder per freeze policy

2 files changed, 49 insertions, 5 deletions

diff --git a/plymouth.spec b/plymouth.spec
index fb938b4..ae6c4d0 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -6,14 +6,15 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.0
-Release: 0.2009.29.09.10%{?dist}
+Release: 0.2009.29.09.19%{?dist}.1
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
 Source1: boot-duration
 Source2: charge.plymouth
 Source3: plymouth-set-default-plugin
-Source4: soas-blueberry.tar.bz2
+Source4: plymouth-update-initrd
+Source5: soas-blueberry.tar.bz2
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +40,10 @@ Patch4: more-drm-fixes.patch
 Patch5: fix-emergency-shell.patch
 Patch6: fix-details-clear-screen.patch
 Patch7: fix-text-shutdown-crash.patch
+Patch8: fix-text-ask-for-password.patch
+Patch9: dont-unlink-devnull.patch
+Patch10: fix-hvc0-console.patch
+Patch11: force-raw-mode.patch
 
 %description
 Plymouth provides an attractive graphical boot animation in
@@ -253,6 +258,10 @@ plugin.
 %patch5 -p1 -b .fix-emergency-shell
 %patch6 -p1 -b .fix-details-clear-screen
 %patch7 -p1 -b .fix-text-shutdown-crash
+%patch8 -p1 -b .fix-text-ask-for-password
+%patch9 -p1 -b .dont-unlink-devnull
+%patch10 -p1 -b .fix-hvc0-console
+%patch11 -p1 -b .force-raw-mode
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -288,7 +297,7 @@ cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
 
 # Add soas, our new default
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/soas
-tar -xvjf %{SOURCE4} -C $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/soas
+tar -xvjf %{SOURCE5} -C $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/soas
 rm -f $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/soas/soas-blueberry.tar.bz2
 cp $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/soas
 
@@ -299,6 +308,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
 cp $RPM_SOURCE_DIR/plymouth-set-default-plugin $RPM_BUILD_ROOT%{_sbindir}
 chmod +x $RPM_BUILD_ROOT%{_sbindir}/plymouth-set-default-plugin
 
+# Override plymouth-update-initrd to work dracut or mkinitrd
+cp -f $RPM_SOURCE_DIR/plymouth-update-initrd $RPM_BUILD_ROOT%{_libexecdir}/plymouth/plymouth-update-initrd
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -471,9 +483,42 @@ fi
 %defattr(-, root, root)
 
 %changelog
-* Sun Oct 11 2009 Sebastian Dziallas <sebastian@when.com> 0.8.0-0.2009.29.09.10
+* Fri Nov 20 2009 Sebastian Dziallas <sebastian@when.com> 0.8.0-0.2009.29.09.19
 - Fork for Sugar on a Stick Blueberry release
 
+* Tue Nov 10 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.19
+- Force raw mode on every text draw.  This works around a bug where
+  some program at startup is kicking the terminal out of raw mode.
+
+* Wed Nov 04 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.18
+- Make plymouth-update-initrd work with dracut
+
+* Tue Nov 03 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.17
+- Add nash dep for plymouth-set-default-theme
+
+* Fri Oct 30 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.16
+- Drop debug spew that snuck in
+
+* Thu Oct 29 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.15
+- Fix plymouth over ppc hyperviser console (bug 531581)
+
+* Thu Oct 29 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.14
+- Don't unlink /dev/null (bug 531740)
+
+* Mon Oct 19 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.13
+- Drop nash dep (bug 528706)
+
+* Wed Oct 14 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.12
+- Don't clear screen in text plugin immediately after displaying
+  password prompt (bug 527426)
+
+* Tue Oct 13 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.11
+- Clean up terminal on exit (bug 528683 again)
+
+* Tue Oct 13 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.10
+- Fix more emergency shell horkage (for users without modesetting)
+  (bug 528683)
+
 * Fri Oct 09 2009 Ray Strode <rstrode@redhat.com> 0.8.0-0.2009.29.09.9
 - Fix frame-buffer fallback plugin
   (broken by details fix in 0.8.0-0.2009.29.09.7)
diff --git a/soas-aslo-and-content.ks b/soas-aslo-and-content.ks
index 898cf81..6522fe4 100644
--- a/soas-aslo-and-content.ks
+++ b/soas-aslo-and-content.ks
@@ -20,7 +20,6 @@ ASLO="$ASLO org.laptop.community.TypingTurtle"
 ASLO="$ASLO org.sugarlabs.IRC"
 ASLO="$ASLO com.garycmartin.Moon"
 ASLO="$ASLO org.laptop.sugar.ReadEtextsActivity"
-ASLO="$ASLO com.ywwg.CartoonBuilderActivity"
 ASLO="$ASLO vu.lux.olpc.Speak"
 ASLO="$ASLO org.laptop.ViewSlidesActivity"
 ASLO="$ASLO org.sugarlabs.InfoSlicer"