SPECS (LINUX_2_6): kernel.spec - bootsplash added (default as its ...

[havner]

Author: havner                       Date: Tue Aug  8 08:41:45 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- bootsplash added (default as its better supported by PLD userspace)
- test build

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1580 -> 1.441.2.1581) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1580 SPECS/kernel.spec:1.441.2.1581
--- SPECS/kernel.spec:1.441.2.1580	Tue Aug  8 01:34:00 2006
+++ SPECS/kernel.spec	Tue Aug  8 10:41:39 2006
@@ -21,6 +21,7 @@
 %bcond_without	grsecurity	# don't build grsecurity at all
 %bcond_without	grsec_minimal	# build only minimal subset (proc,link,fifo,shm)
 
+%bcond_with	fbsplash	# fbsplash instead of bootsplash
 %bcond_with	vesafb_tng	# vesafb-tng, vesafb replacement from gentoo
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
@@ -175,6 +176,8 @@
 # tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
 Patch2:		tahoe9xx-2.6.11.5.patch
 
+#	ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.15.diff
+Patch3:		bootsplash-3.1.6-2.6.15.diff
 #	http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.16.patch
 Patch4:		fbsplash-0.9.2-r5-2.6.16.patch
 Patch5:		linux-2.6-vesafb-tng.patch
@@ -716,7 +719,13 @@
 
 %patch2 -p1
 
+%patch8 -p1
+
+%if %{without fbsplash}
+%patch3 -p1
+%else
 %patch4 -p1
+%endif
 
 %ifarch %{ix86}
 %{?with_vesafb_tng:%patch5 -p1}
@@ -725,7 +734,6 @@
 %patch6 -p1
 
 %patch7 -p1
-%patch8 -p1
 %patch9 -p1
 
 ## netfilter
@@ -1628,6 +1636,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1581  2006/08/08 08:41:39  havner
+- bootsplash added (default as its better supported by PLD userspace)
+- test build
+
 Revision 1.441.2.1580  2006/08/07 23:34:00  cieciwa
 - don't touch kernel.spec - netfilter in progress.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1580&r2=1.441.2.1581&f=u