SPECS (LINUX_2_6): kernel.spec - cleanups and unify

[glen]

Author: glen                         Date: Mon Apr 24 22:55:12 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- cleanups and unify

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1510 -> 1.441.2.1511) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1510 SPECS/kernel.spec:1.441.2.1511
--- SPECS/kernel.spec:1.441.2.1510	Mon Apr 24 20:23:10 2006
+++ SPECS/kernel.spec	Tue Apr 25 00:55:07 2006
@@ -1013,8 +1013,11 @@
 KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-UP"
 rm -rf $KERNEL_INSTALL_DIR
 BuildConfig
-%{?with_up:BuildKernel}
-%{?with_up:PreInstallKernel}
+%if %{with up}
+BuildKernel
+PreInstallKernel
+%endif
+
 # SMP KERNEL
 KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-SMP"
 rm -rf $KERNEL_INSTALL_DIR
@@ -1089,7 +1092,7 @@
 %if %{with up} || %{with smp}
 # UP or SMP
 install $KERNEL_BUILD_DIR/build-done/kernel-*/usr/src/linux-%{version}/include/linux/* \
-$RPM_BUILD_ROOT/usr/src/linux-%{version}/include/linux
+	$RPM_BUILD_ROOT/usr/src/linux-%{version}/include/linux
 %endif
 
 %{__make} $CrossOpts mrproper
@@ -1250,7 +1253,6 @@
 %depmod %{version}-%{release}smp
 
 %post headers
-# TODO: avoid %%post here and package symlink?
 rm -f /usr/src/linux
 ln -snf linux-%{version} /usr/src/linux
 
@@ -1592,6 +1594,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1511  2006/04/24 22:55:07  glen
+- cleanups and unify
+
 Revision 1.441.2.1510  2006/04/24 18:23:10  adamg
 - updated to 2.6.16.10
 
@@ -1695,7 +1700,7 @@
 
 Revision 1.441.2.1480  2006/04/11 20:47:16  cieciwa
 - _rel 1.6,
-added ACCOUNT and accouont netfilter module.
+  added ACCOUNT and accouont netfilter module.
 
 Revision 1.441.2.1479  2006/04/11 18:27:05  baggins
 - rel 1.5
@@ -1727,7 +1732,7 @@
 
 Revision 1.441.2.1470  2006/04/10 06:37:21  cieciwa
 - _rel 1,
-STBR - TH
+  STBR - TH
 
 Revision 1.441.2.1469  2006/04/07 22:08:39  cieciwa
 - updated MD5 sum.
@@ -1742,12 +1747,11 @@
 
 Revision 1.441.2.1466  2006/04/07 08:15:21  cieciwa
 - working on sources/module-build.
-
-NFY.
+  NFY.
 
 Revision 1.441.2.1465  2006/04/07 07:58:25  cieciwa
 - added esfq [current version].
-NFY
+  NFY
 
 Revision 1.441.2.1464  2006/04/07 06:44:42  cieciwa
 - typo ?
@@ -1875,9 +1879,8 @@
 Revision 1.441.2.1432  2006/03/22 10:54:32  cieciwa
 - _rel 0.3,
 - added bcond suspend2,
-- added suspend2 source [not applayed YET].
-
-NFY
+- added suspend2 source [not applied YET].
+  NFY
 
 Revision 1.441.2.1431  2006/03/22 09:41:56  cieciwa
 - added linux-kbuild-extmod.patch as patch0.
@@ -1919,6 +1922,4 @@
 - updated MD5 sum,
 - removing ALL patches,
 - cuting changelog.
-
-NFY.
-
+  NFY.
================================================================

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