SPECS: kernel-desktop.spec - enable bootsplash all the way - indic...

[czarny]

Author: czarny                       Date: Thu Aug 30 10:38:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- enable bootsplash all the way
- indicate what splash is used (for splashy and usplash later use)
- require newest geninitrd (8702) to generate bootsplash/fbsplash
- suggest bootsplash/splashutils for bootsplash/splashutils versions
- removed forgotten smp Feature
- geninitrd with initramfs by default, suspend2 and bootsplash/fbsplash accordingly

---- Files affected:
SPECS:
   kernel-desktop.spec (1.122 -> 1.123) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.122 SPECS/kernel-desktop.spec:1.123
--- SPECS/kernel-desktop.spec:1.122	Thu Aug 30 10:31:11 2007
+++ SPECS/kernel-desktop.spec	Thu Aug 30 12:38:43 2007
@@ -10,8 +10,8 @@
 # - convert patches to common diff -uNp format
 # - make sure patch numbering is consistent and preapare it
 #   for the future
-# - investigate ppc-ICE patches from kernel.spec (does it fix the e1000 ICE?)
-# - investigate pwc-uncompress patch from kernel.spec
+# - investigate ppc-ICE patches from kernel.spec (does it fix the e1000 ICE?) 
+# - investigate pwc-uncompress patch from kernel.spec 
 # - investigate apparmor-caps patch from kernel.spec
 # - actively search for other superb enhancing patches 
 #   (even the experimental ones, as kernel-desktop is not 
@@ -34,6 +34,13 @@
 
 %{?debug:%define with_verbose 1}
 
+%if %{with bootsplash}
+%undefine	with_fbsplash
+%else
+%define		with_fbsplash	1
+%endif
+
+
 %ifnarch %{ix86}
 %undefine	with_pae
 %endif
@@ -264,8 +271,10 @@
 BuildRequires:	rpmbuild(macros) >= 1.217
 Autoreqprov:	no
 Requires:	coreutils
-Requires:	geninitrd >= 2.57
+Requires:	geninitrd >= 8702
 Requires:	module-init-tools >= 0.9.9
+%{?with_bootsplash:Suggests:	bootsplash}
+%{?with_fbsplash:Suggests:	splashutils}
 Provides:	%{name}-up = %{epoch}:%{version}-%{release}
 Provides:	kernel = %{epoch}:%{version}-%{release}
 Provides:	kernel(netfilter) = %{_netfilter_snap}
@@ -334,9 +343,7 @@
 %{?with_preemptrt: - realtime-preempt patch by Ingo Molar}\
 %{?with_ck: - desktop patchset by Con Kolivas}\
 %{?with_grsec_minimal: - grsecurity minimal}\
- - %{?with_bootsplash:bootsplash}%{!?with_bootsplash:fbsplash}\
-%{?with_smp: - Multi Processor support}\
-%{!?with_smp:%{?with_pae: - PAE (HIGHMEM64G) support}}\
+ - %{?with_bootsplash:bootsplash}%{?with_fbsplash:fbsplash}\
  - HZ=100%{!?with_laptop:0}
 
 %define Features %(echo "%{__features}" | sed '/^$/d')
@@ -918,7 +925,7 @@
 
 %depmod %{kernel_release}
 
-/sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
+/sbin/geninitrd -f --initrdfs=initramfs %{?with_bootsplash:--with-bootsplash} %{?with_fbsplash:--with-fbsplash} --with-suspend2 %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
 mv -f %{initrd_dir}/initrd-%{alt_kernel} %{initrd_dir}/initrd-%{alt_kernel}.old 2> /dev/null > /dev/null
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
 
@@ -1122,6 +1129,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2007/08/30 10:38:43  czarny
+- enable bootsplash all the way
+- indicate what splash is used (for splashy and usplash later use)
+- require newest geninitrd (8702) to generate bootsplash/fbsplash
+- suggest bootsplash/splashutils for bootsplash/splashutils versions
+- removed forgotten smp Feature
+- geninitrd with initramfs by default, suspend2 and bootsplash/fbsplash accordingly
+
 Revision 1.122  2007/08/30 08:31:11  glen
 - rndis_host patch from synce
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.122&r2=1.123&f=u