SPECS (LINUX_2_6): kernel.spec - bcond for disabling vesafb-tng pa...

[adamg]

Author: adamg                        Date: Thu Apr  6 05:49:13 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- bcond for disabling vesafb-tng patch (it is compiled in statically
  and breaks other modules, on the other hand it supports high resolutions
  like 1400x1050-32
- fixed path for suspend2
- hdaps_protect.patch applied (adds support for for thinkpad's disk
  protection systems

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1461 -> 1.441.2.1462) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1461 SPECS/kernel.spec:1.441.2.1462
--- SPECS/kernel.spec:1.441.2.1461	Tue Apr  4 21:50:14 2006
+++ SPECS/kernel.spec	Thu Apr  6 07:49:07 2006
@@ -8,6 +8,7 @@
 %bcond_without	up		# don't build UP kernel
 %bcond_without	source		# don't build kernel-source package
 %bcond_without	pcmcia		# don't build pcmcia
+%bcond_without	vesafb_tng	# build without vesafb-tng patch applied (breaks other fb modules)
 
 %bcond_with     preemptive      # build preemptive kernel
 %bcond_with	suspend2	# build software suspend support
@@ -181,6 +182,11 @@
 
 Patch51:	http://bluetooth-alsa.sourceforge.net/sco-mtu.patch
 
+# support for HDAPS (Hard Disk Active Protection System) 
+# that can be found in IBM/Lenovo ThinkPad laptops
+# from: http://www.dresco.co.uk/hdaps/hdaps_protect.20060326.patch
+Patch52:	linux-hdaps_protect.patch
+
 # vserver from: http://vserver.13thfloor.at/Experimental/patch-2.6.16-vs2.0.2-rc14.diff
 Patch100:	patch-2.6.16-vs2.0.2-rc14.diff
 
@@ -608,10 +614,10 @@
 %endif
 
 %if %{with suspend2}
-for i in suspend2-%{suspend_version}-for-%{version}/*.patch; do
+for i in suspend2-%{suspend_version}-for-2.6.16/*.patch; do
 patch -p1 -s < $i
 done
-patch -p1 -s < suspend2-%{suspend_version}-for-%{version}/3010-fork-non-conflicting-pages-for-copyback
+patch -p1 -s < suspend2-%{suspend_version}-for-2.6.16/3010-fork-non-conflicting-pages-for-copyback
 %endif
 
 # reiserfs4
@@ -620,7 +626,9 @@
 %patch2 -p1
 
 %patch4 -p1
+%if %{with vesafb_tng}
 %patch5 -p1
+%endif
 
 %patch6 -p1
 
@@ -651,6 +659,8 @@
 
 %patch51 -p1
 
+%patch52 -p1
+
 %if %{with vserver}
 %patch100 -p1
 %endif
@@ -763,7 +773,9 @@
 %endif
 
 	# vesafb-tng
+%if %{with vesafb_tng}
 	cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
+%endif
 
 	# fbsplash
 	echo "CONFIG_FB_SPLASH=y" >> arch/%{_target_base_arch}/defconfig
@@ -1469,6 +1481,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1462  2006/04/06 05:49:07  adamg
+- bcond for disabling vesafb-tng patch (it is compiled in statically
+  and breaks other modules, on the other hand it supports high resolutions
+  like 1400x1050-32
+- fixed path for suspend2
+- hdaps_protect.patch applied (adds support for for thinkpad's disk
+  protection systems
+
 Revision 1.441.2.1461  2006/04/04 19:50:14  cieciwa
 - _rel 0.5,
 - added vesafb-tng config [ix86 only]
================================================================

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