From 5eeba1efaf65829e9adad10d439ca54018a71b68 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Nov 16 2012 04:03:08 +0000
Subject: - Drop set-default-plugin compat script

- Just use upstream update-initrd

---

diff --git a/jlaska-test.patch b/jlaska-test.patch
deleted file mode 100644
index b08ef28..0000000
--- a/jlaska-test.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 502d5951aa5b8ece34fa21032d513254ef146f69 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 1 Mar 2011 17:26:16 -0500
-Subject: [PATCH] terminal: apply terminal settings immediately
-
----
- src/libply-splash-core/ply-terminal.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
-index 3f126bc..3e6e8cc 100644
---- a/src/libply-splash-core/ply-terminal.c
-+++ b/src/libply-splash-core/ply-terminal.c
-@@ -272,7 +272,7 @@ ply_terminal_set_buffered_input (ply_terminal_t *terminal)
-       term_attributes.c_oflag |= OPOST;
-       term_attributes.c_lflag |= ECHO | ICANON | ISIG | IEXTEN;
- 
--      if (tcsetattr (terminal->fd, TCSAFLUSH, &term_attributes) != 0)
-+      if (tcsetattr (terminal->fd, TCSANOW, &term_attributes) != 0)
-         return false;
- 
-       terminal->is_unbuffered = false;
-@@ -280,7 +280,7 @@ ply_terminal_set_buffered_input (ply_terminal_t *terminal)
-       return true;
-     }
- 
--  if (tcsetattr (terminal->fd, TCSAFLUSH, &terminal->original_term_attributes) != 0)
-+  if (tcsetattr (terminal->fd, TCSANOW, &terminal->original_term_attributes) != 0)
-     return false;
- 
-   terminal->is_unbuffered = false;
--- 
-1.7.4.1
-
diff --git a/plymouth-fix-udev-trigger.patch b/plymouth-fix-udev-trigger.patch
deleted file mode 100644
index fb13cd3..0000000
--- a/plymouth-fix-udev-trigger.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up plymouth-0.8.6.2/systemd-units/plymouth-start.service.in.dma plymouth-0.8.6.2/systemd-units/plymouth-start.service.in
---- plymouth-0.8.6.2/systemd-units/plymouth-start.service.in.dma	2012-08-21 09:11:22.906284758 +1000
-+++ plymouth-0.8.6.2/systemd-units/plymouth-start.service.in	2012-08-21 09:11:32.707345054 +1000
-@@ -2,7 +2,7 @@
- Description=Show Plymouth Boot Screen
- DefaultDependencies=no
- Wants=systemd-ask-password-plymouth.path
--After=systemd-vconsole-setup.service systemd-udev-settle.service
-+After=systemd-vconsole-setup.service systemd-udev-trigger.service
- Before=systemd-ask-password-plymouth.service
- ConditionKernelCommandLine=!plymouth.enable=0
- ConditionPathExists=!@plymouthruntimedir@/pid
diff --git a/plymouth-set-default-plugin b/plymouth-set-default-plugin
deleted file mode 100644
index 610f89e..0000000
--- a/plymouth-set-default-plugin
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "plymouth-set-default-plugin has been deprecated by plymouth-set-default-theme"
diff --git a/plymouth-update-initrd b/plymouth-update-initrd
deleted file mode 100755
index c07b561..0000000
--- a/plymouth-update-initrd
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/sbin/new-kernel-pkg --package kernel --mkinitrd --dracut --depmod --install $(uname -r)
diff --git a/plymouth.spec b/plymouth.spec
index 895cb33..bc0f1dd 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -6,14 +6,12 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 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: plymouth-update-initrd
 
 URL: http://www.freedesktop.org/wiki/Software/Plymouth
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -283,16 +281,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
 cp $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow/{box,bullet,entry,lock}.png $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge
 
-# 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
-
 # Drop glow, it's not very Fedora-y
 rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
 
-# Add compat script for upgrades
-cp $RPM_SOURCE_DIR/plymouth-set-default-plugin $RPM_BUILD_ROOT%{_sbindir}
-chmod +x $RPM_BUILD_ROOT%{_sbindir}/plymouth-set-default-plugin
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -430,7 +421,6 @@ fi
 %files scripts
 %defattr(-, root, root)
 %{_sbindir}/plymouth-set-default-theme
-%{_sbindir}/plymouth-set-default-plugin
 %{_libexecdir}/plymouth/plymouth-update-initrd
 %{_libexecdir}/plymouth/plymouth-generate-initrd
 %{_libexecdir}/plymouth/plymouth-populate-initrd
@@ -507,6 +497,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Thu Nov 15 2012 Ray Strode <rstrode@redhat.com> 0.8.8-4
+- Drop set-default-plugin compat script
+- Just use upstream update-initrd
+
 * Fri Nov 02 2012 Ray Strode <rstrode@redhat.com> 0.8.8-3
 - More boot blocking fixes
   Related: #870695