From 91c8a3917778018488cef9b1d122de1c0a7c474b Mon Sep 17 00:00:00 2001 From: Florent Villard Date: Thu, 7 Mar 2002 21:39:51 +0000 Subject: add new images add initrd rebuilding in post and reinstalling of lilo/yaboot --- bootsplash.spec | 44 +++++++++++++++++++++ .../data/Mandrake/images/bootsplash-1024x768.jpg | Bin 37664 -> 60586 bytes .../data/Mandrake/images/bootsplash-1280x1024.jpg | Bin 49739 -> 73248 bytes themes/data/Mandrake/images/bootsplash-800x600.jpg | Bin 29759 -> 52898 bytes 4 files changed, 44 insertions(+) diff --git a/bootsplash.spec b/bootsplash.spec index 0692ca0..c0b9125 100644 --- a/bootsplash.spec +++ b/bootsplash.spec @@ -1,6 +1,12 @@ %define name bootsplash +<<<<<<< bootsplash.spec +%define version 1.3.7 +%define release 1mdk +%define _bootdir /boot +======= %define version 1.3.6 %define release 2mdk +>>>>>>> 1.24 Summary: The Boot Splash Images and scripts Name: %{name} @@ -17,6 +23,8 @@ Requires: /usr/bin/perl Requires: mkinitrd > 3.1.6-25mdk #there is no way to say a special kernel requires. Requires: kernel +Obsoletes: Aurora Aurora-Monitor-NewStyle-Categorizing-WsLib Aurora-Monitor-NewStyle-WsLib Aurora-Monitor-Traditional-Gtk+ Aurora-Monitor-Traditional-WsLib-8.2 + # nomore noarch with the fbrelolution and progress binaries #BuildArchitectures: noarch @@ -39,6 +47,37 @@ cd .. rm -rf $RPM_BUILD_ROOT make install prefix=$RPM_BUILD_ROOT +%post +cd %{_bootdir} + if [[ -x /usr/share/loader/make-initrd ]]; then + /usr/share/loader/make-initrd -n &> /dev/null + if [[ -x /usr/sbin/detectloader ]]; then + LOADER=$(/usr/sbin/detectloader -q) + if [[ $LOADER = "LILO" ]] && [[ -x /sbin/lilo ]];then + /sbin/lilo >/dev/null 2>/dev/null + fi + if [[ $LOADER = "YABOOT" ]] && [[ -x /sbin/ybin ]];then + /sbin/ybin >/dev/null 2>/dev/null + fi + fi + fi + +%postun +cd %{_bootdir} + if [[ -x /usr/share/loader/make-initrd ]]; then + /usr/share/loader/make-initrd -n &> /dev/null + if [[ -x /usr/sbin/detectloader ]]; then + LOADER=$(/usr/sbin/detectloader -q) + if [[ $LOADER = "LILO" ]] && [[ -x /sbin/lilo ]];then + /sbin/lilo >/dev/null 2>/dev/null + fi + if [[ $LOADER = "YABOOT" ]] && [[ -x /sbin/ybin ]];then + /sbin/ybin >/dev/null 2>/dev/null + fi + fi + fi + + %clean rm -rf $RPM_BUILD_ROOT @@ -51,6 +90,11 @@ rm -rf $RPM_BUILD_ROOT /bin/* %changelog +* Thu Mar 07 2002 Warly 1.3.7-1mdk +- obsolete Aurora +- new images +- update initrd (or try to) + * Wed Mar 06 2002 David BAUDENS 1.3.6-2mdk - Remove non Mandrake's theme diff --git a/themes/data/Mandrake/images/bootsplash-1024x768.jpg b/themes/data/Mandrake/images/bootsplash-1024x768.jpg index 307100a..c57ad5b 100644 Binary files a/themes/data/Mandrake/images/bootsplash-1024x768.jpg and b/themes/data/Mandrake/images/bootsplash-1024x768.jpg differ diff --git a/themes/data/Mandrake/images/bootsplash-1280x1024.jpg b/themes/data/Mandrake/images/bootsplash-1280x1024.jpg index 3a5cb8f..fa2871c 100644 Binary files a/themes/data/Mandrake/images/bootsplash-1280x1024.jpg and b/themes/data/Mandrake/images/bootsplash-1280x1024.jpg differ diff --git a/themes/data/Mandrake/images/bootsplash-800x600.jpg b/themes/data/Mandrake/images/bootsplash-800x600.jpg index 4f057ae..768d240 100644 Binary files a/themes/data/Mandrake/images/bootsplash-800x600.jpg and b/themes/data/Mandrake/images/bootsplash-800x600.jpg differ -- cgit v1.2.1