SPECS (LINUX_2_6): kernel.spec - updated fbsplash, renamed to fbco...

[zbyniu]

Author: zbyniu                       Date: Thu Apr 24 10:12:57 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- updated fbsplash, renamed to fbcondecor as patch/project name

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1884 -> 1.441.2.1885) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1884 SPECS/kernel.spec:1.441.2.1885
--- SPECS/kernel.spec:1.441.2.1884	Wed Apr 23 21:05:27 2008
+++ SPECS/kernel.spec	Thu Apr 24 12:12:51 2008
@@ -34,7 +34,7 @@
 %bcond_with	pax_full	# build pax and full grsecurity (ie. grsec_full && pax)
 %bcond_with	pax		# build pax support
 
-%bcond_with	fbsplash	# fbsplash instead of bootsplash
+%bcond_with	fbcondecor	# fbsplash/fbcondecor instead of bootsplash
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
 
@@ -70,7 +70,6 @@
 %define		with_grsecurity		1
 %if %{with pax}
 %define		with_pax_full		1
-%undefine	with_pax
 %endif
 %endif
 
@@ -221,8 +220,8 @@
 
 # ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.21.diff.gz
 Patch3:		linux-2.6-bootsplash.patch
-# based on http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.20-rc6.patch
-Patch4:		fbsplash-0.9.2-r5-2.6.20-rc6.patch
+# http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.24-rc7.patch
+Patch4:		kernel-fbcondecor.patch
 
 # http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tgz
 # squashfs3.3/kernel-patches/linux-2.6.24/squashfs3.3-patch
@@ -500,7 +499,7 @@
 %{?with_pax:PaX support - enabled}\
 %{?with_xen0:Xen 0 - enabled}\
 %{?with_xenU:Xen U - enabled}\
-%{?with_fbsplash:Fbsplash - enabled }\
+%{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
 %{?with_nfsroot:Root on NFS - enabled}
 
 %define Features %(echo "%{__features}" | sed '/^$/d')
@@ -780,7 +779,7 @@
 
 %patch8 -p1
 
-%if !%{with fbsplash}
+%if !%{with fbcondecor}
 %patch3 -p1
 %else
 %patch4 -p1
@@ -1210,13 +1209,8 @@
 	cat %{SOURCE47} >> %{defconfig}
 %endif
 
-%if %{with fbsplash}
-	echo "CONFIG_FB_SPLASH=y" >> %{defconfig}
-	sed -i "s:CONFIG_FB_TILEBLITTING=.:# CONFIG_FB_TILEBLITTING is not set:" %{defconfig}
-	sed -i "s:CONFIG_FB_S3=.:# CONFIG_FB_S3 is not set:" %{defconfig}
-	sed -i "s:CONFIG_FB_VT8623=.:# CONFIG_FB_VT8623 is not set:" %{defconfig}
-	sed -i "s:CONFIG_FB_MATROX=.:# CONFIG_FB_MATROX is not set:" %{defconfig}
-	sed -i "s:CONFIG_FB_ARK=.:# CONFIG_FB_ARK is not set:" %{defconfig}
+%if %{with fbcondecor}
+	echo "CONFIG_FB_CON_DECOR=y" >> %{defconfig}
 %else
 	echo "CONFIG_BOOTSPLASH=y" >> %{defconfig}
 %endif
@@ -1708,6 +1702,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1885  2008-04-24 10:12:51  zbyniu
+- updated fbsplash, renamed to fbcondecor as patch/project name
+
 Revision 1.441.2.1884  2008-04-23 19:05:27  zbyniu
 - typo
 
================================================================

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