SPECS (hawk-LINUX_2_6): kernel.spec - proper name depending on con...

[hawk]

Author: hawk                         Date: Sun Jan 28 11:43:22 2007 GMT
Module: SPECS                         Tag: hawk-LINUX_2_6
---- Log message:
- proper name depending on conditional builds
- fixed grsecurity/vserver config inclusion

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1701.2.3 -> 1.441.2.1701.2.4) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1701.2.3 SPECS/kernel.spec:1.441.2.1701.2.4
--- SPECS/kernel.spec:1.441.2.1701.2.3	Sun Jan 28 12:02:13 2007
+++ SPECS/kernel.spec	Sun Jan 28 12:43:16 2007
@@ -78,7 +78,7 @@
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(fr):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl):	Jądro Linuksa
-Name:		kernel
+Name:		kernel{?with_grsec_full:-grsecurity}{?with_vserver:-vserver}
 Version:	%{_basever}%{_postver}
 Release:	%{_rel}
 Epoch:		3
@@ -694,11 +694,11 @@
 	cat %{SOURCE42} >> .config
 
 	%if %{with vserver}
-	cat %{SOURCE43} >> arch/%{_target_base_arch}/defconfig
+	cat %{SOURCE43} >> .config
 	%endif
 
 	%if %{with grsecurity}
-	cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
+	cat %{SOURCE44} >> .config
 	%endif
 
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" .config}
@@ -1337,6 +1337,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1701.2.4  2007/01/28 11:43:16  hawk
+- proper name depending on conditional builds
+- fixed grsecurity/vserver config inclusion
+
 Revision 1.441.2.1701.2.3  2007/01/28 11:02:13  hawk
 - configs for vserver and grsecurity
 
================================================================

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