Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/smoku/installer

This commit is contained in:
Joanna Rutkowska 2011-04-06 15:17:39 +02:00
commit ca9bdf05df
5 changed files with 17 additions and 3 deletions

1
firstboot/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*.py[co]

View File

@ -0,0 +1,4 @@
# Distribution defaults. Changes to this file will get overwritten during
# upgrades.
[Daemon]
Theme=script

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 314 B

View File

@ -17,6 +17,7 @@ Conflicts: anaconda-images <= 10
Conflicts: redhat-artwork <= 5.0.5 Conflicts: redhat-artwork <= 5.0.5
# For _kde4_appsdir macro: # For _kde4_appsdir macro:
BuildRequires: kde-filesystem BuildRequires: kde-filesystem
Requires: plymouth-theme-script
%description %description
@ -49,22 +50,30 @@ done
mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536 mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536
install -p -m 644 ksplash/SolarComet-kde.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png install -p -m 644 ksplash/SolarComet-kde.png $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png
mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge/ for k in charge script; do
for i in plymouth/charge/* ; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/$k/
install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge/ for i in plymouth/$k/* ; do
install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/$k/
done
done done
install -p -m 644 plymouth/plymouthd.defaults $RPM_BUILD_ROOT%{_datadir}/plymouth
(cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install) (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post
/usr/sbin/plymouth-set-default-theme script || :
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc COPYING COPYING-kde-logo %doc COPYING COPYING-kde-logo
%{_datadir}/firstboot/themes/* %{_datadir}/firstboot/themes/*
%{_datadir}/anaconda/pixmaps/* %{_datadir}/anaconda/pixmaps/*
%{_datadir}/plymouth/plymouthd.defaults
%{_datadir}/plymouth/themes/charge/* %{_datadir}/plymouth/themes/charge/*
%{_datadir}/plymouth/themes/script/*
%{_datadir}/pixmaps/splash/* %{_datadir}/pixmaps/splash/*
/usr/lib/anaconda-runtime/*.jpg /usr/lib/anaconda-runtime/*.jpg
%{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png %{_kde4_appsdir}/ksplash/Themes/Leonidas/2048x1536/logo.png