aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2002-03-07 21:39:51 +0000
committerFlorent Villard <warly@mandriva.com>2002-03-07 21:39:51 +0000
commit91c8a3917778018488cef9b1d122de1c0a7c474b (patch)
tree8ef29720403b998dfdc3fd5f69ffa92dfeefcd03
parenta1c4d5c24968fbfa599aa1819212fbfd8caaab39 (diff)
downloadbootsplash-91c8a3917778018488cef9b1d122de1c0a7c474b.tar
bootsplash-91c8a3917778018488cef9b1d122de1c0a7c474b.tar.gz
bootsplash-91c8a3917778018488cef9b1d122de1c0a7c474b.tar.bz2
bootsplash-91c8a3917778018488cef9b1d122de1c0a7c474b.tar.xz
bootsplash-91c8a3917778018488cef9b1d122de1c0a7c474b.zip
add new images
add initrd rebuilding in post and reinstalling of lilo/yaboot
-rw-r--r--bootsplash.spec44
-rw-r--r--themes/data/Mandrake/images/bootsplash-1024x768.jpgbin37664 -> 60586 bytes
-rw-r--r--themes/data/Mandrake/images/bootsplash-1280x1024.jpgbin49739 -> 73248 bytes
-rw-r--r--themes/data/Mandrake/images/bootsplash-800x600.jpgbin29759 -> 52898 bytes
4 files changed, 44 insertions, 0 deletions
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 <warly@mandrakesoft.com> 1.3.7-1mdk
+- obsolete Aurora
+- new images
+- update initrd (or try to)
+
* Wed Mar 06 2002 David BAUDENS <baudens@mandrakesoft.com> 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
--- a/themes/data/Mandrake/images/bootsplash-1024x768.jpg
+++ b/themes/data/Mandrake/images/bootsplash-1024x768.jpg
Binary files differ
diff --git a/themes/data/Mandrake/images/bootsplash-1280x1024.jpg b/themes/data/Mandrake/images/bootsplash-1280x1024.jpg
index 3a5cb8f..fa2871c 100644
--- a/themes/data/Mandrake/images/bootsplash-1280x1024.jpg
+++ b/themes/data/Mandrake/images/bootsplash-1280x1024.jpg
Binary files differ
diff --git a/themes/data/Mandrake/images/bootsplash-800x600.jpg b/themes/data/Mandrake/images/bootsplash-800x600.jpg
index 4f057ae..768d240 100644
--- a/themes/data/Mandrake/images/bootsplash-800x600.jpg
+++ b/themes/data/Mandrake/images/bootsplash-800x600.jpg
Binary files differ