From 41d62e3cee005455a48debf46b96808e38034712 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Wed, 6 Apr 2011 16:38:30 +0200 Subject: [PATCH] Install Qubes replacement files in parallel and overwrite on install. --- ...{plymouthd.defaults => plymouthd.defaults.qubes} | 0 .../{progress_bar.png => progress_bar.png.qubes} | Bin .../{progress_box.png => progress_box.png.qubes} | Bin qubes-logos/qubes-logos.spec | 7 +++++-- 4 files changed, 5 insertions(+), 2 deletions(-) rename qubes-logos/plymouth/{plymouthd.defaults => plymouthd.defaults.qubes} (100%) rename qubes-logos/plymouth/script/{progress_bar.png => progress_bar.png.qubes} (100%) rename qubes-logos/plymouth/script/{progress_box.png => progress_box.png.qubes} (100%) diff --git a/qubes-logos/plymouth/plymouthd.defaults b/qubes-logos/plymouth/plymouthd.defaults.qubes similarity index 100% rename from qubes-logos/plymouth/plymouthd.defaults rename to qubes-logos/plymouth/plymouthd.defaults.qubes diff --git a/qubes-logos/plymouth/script/progress_bar.png b/qubes-logos/plymouth/script/progress_bar.png.qubes similarity index 100% rename from qubes-logos/plymouth/script/progress_bar.png rename to qubes-logos/plymouth/script/progress_bar.png.qubes diff --git a/qubes-logos/plymouth/script/progress_box.png b/qubes-logos/plymouth/script/progress_box.png.qubes similarity index 100% rename from qubes-logos/plymouth/script/progress_box.png rename to qubes-logos/plymouth/script/progress_box.png.qubes diff --git a/qubes-logos/qubes-logos.spec b/qubes-logos/qubes-logos.spec index 068d691..9aaee20 100644 --- a/qubes-logos/qubes-logos.spec +++ b/qubes-logos/qubes-logos.spec @@ -56,7 +56,7 @@ for k in charge script; do install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/$k/ done done -install -p -m 644 plymouth/plymouthd.defaults $RPM_BUILD_ROOT%{_datadir}/plymouth +install -p -m 644 plymouth/plymouthd.defaults.qubes $RPM_BUILD_ROOT%{_datadir}/plymouth (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install) @@ -64,6 +64,9 @@ install -p -m 644 plymouth/plymouthd.defaults $RPM_BUILD_ROOT%{_datadir}/plymout rm -rf $RPM_BUILD_ROOT %post +cp -f %{_datadir}/plymouth/plymouthd.defaults.qubes %{_datadir}/plymouth/plymouthd.defaults +cp -f %{_datadir}/plymouth/themes/script/progress_bar.png.qubes %{_datadir}/plymouth/themes/script/progress_bar.png +cp -f %{_datadir}/plymouth/themes/script/progress_box.png.qubes %{_datadir}/plymouth/themes/script/progress_box.png /usr/sbin/plymouth-set-default-theme script || : %files @@ -71,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING COPYING-kde-logo %{_datadir}/firstboot/themes/* %{_datadir}/anaconda/pixmaps/* -%{_datadir}/plymouth/plymouthd.defaults +%{_datadir}/plymouth/plymouthd.defaults.qubes %{_datadir}/plymouth/themes/charge/* %{_datadir}/plymouth/themes/script/* %{_datadir}/pixmaps/splash/*