SPECS: kernel-desktop.spec - bconds cleanup, enabled fbconsole=y f...

[glen]

Author: glen                         Date: Mon Apr 14 23:59:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bconds cleanup, enabled fbconsole=y for fbsplash

---- Files affected:
SPECS:
   kernel-desktop.spec (1.189 -> 1.190) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.189 SPECS/kernel-desktop.spec:1.190
--- SPECS/kernel-desktop.spec:1.189	Mon Apr 14 08:20:59 2008
+++ SPECS/kernel-desktop.spec	Tue Apr 15 01:59:04 2008
@@ -72,7 +72,7 @@
 
 %define		_basever	2.6.24
 %define		_postver	.4
-%define		_rel		0.2
+%define		_rel		0.3
 %define		_rc	%{nil}
 
 %define		_enable_debug_packages			0
@@ -613,7 +613,8 @@
 ### console
 %if %{with bootsplash}
 %patch30 -p1
-%else
+%endif
+%if %{with fbsplash}
 %patch31 -p1
 %endif
 
@@ -745,7 +746,7 @@
 CONFIGS += %{_sourcedir}/%{pname}-tuxonice.config
 %endif
 
-# fbsplash, vesafb-tng, squashfs, tahoe, atm
+# tahoe, atm
 CONFIGS += %{_sourcedir}/%{pname}-patches.config
 
 # netfilter
@@ -776,9 +777,11 @@
 %endif
 
 %if %{with bootsplash}
-	CONFIGS += %{_sourcedir}/%{pname}-bootsplash.config
-%else
-	CONFIGS += %{_sourcedir}/%{pname}-fbsplash.config
+CONFIGS += %{_sourcedir}/%{pname}-bootsplash.config
+%endif
+
+%if %{with fbsplash}
+CONFIGS += %{_sourcedir}/%{pname}-fbsplash.config
 %endif
 
 # config where we ignore timestamps
@@ -1197,6 +1200,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.190  2008-04-14 23:59:04  glen
+- bconds cleanup, enabled fbconsole=y for fbsplash
+
 Revision 1.189  2008-04-14 06:20:59  adamg
 - kernel-desktop-module-build += sigframe_32.h
 
================================================================

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