--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec	2011/05/03 22:24:58	94546
+++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec	2011/05/05 16:50:36	95167
@@ -134,7 +134,7 @@
 #
 # SRC RPM description
 #
-Summary: 	Linux kernel built for Mandriva with modifications by %{ktag}
+Summary: 	Linux kernel built for %vendor with modifications by %{ktag}
 Name:		%{kname}
 Version: 	%{kversion}
 Release: 	%{rpmrel}
@@ -142,7 +142,7 @@
 Group: 	 	System/Kernel and hardware
 ExclusiveArch: 	%{ix86} x86_64
 ExclusiveOS: 	Linux
-URL: 		http://wiki.mandriva.com/en/Docs/Howto/Mandriva_Kernels#kernel-tmb
+URL: 		http://www.kernel.org
 
 ####################################################################
 #
@@ -193,19 +193,10 @@
 # Defines for the things that are needed for all the kernels
 #
 %define common_description_kernel The kernel package contains the Linux kernel (vmlinuz), the core of your \
-Mandriva Linux operating system.  The kernel handles the basic functions \
+%vendor Linux operating system.  The kernel handles the basic functions \
 of the operating system:  memory allocation, process allocation, device \
 input and output, etc.
 
-%define common_description_info For instructions for update, see:	\
-http://www.mandriva.com/en/security/kernelupdate			\
-									\
-The %{ktag} kernels is an experimental kernel based on the kernel.org	\
-kernels with added patches. Some of them may/will never end up in	\
-the main kernels due to their experimental nature. Some refer to	\
-this kernel as a 'hackkernel' ...					\
-Use these kernels at your own risk !!
-
 ### Global Requires/Provides
 %define requires1 	mkinitrd >= 6.0.92-12
 %define requires2 	bootloader-utils >= 1.12-1
@@ -222,8 +213,6 @@
 %description
 %common_description_kernel
 
-%common_description_info
-
 
 # mkflavour() name flavour processor
 # name: the flavour name in the package name
@@ -243,8 +232,6 @@
 %description -n %{kname}-%{1}-%{buildrel}		\
 %common_description_kernel %{expand:%{info_%(echo %{1})}} \
 							\
-%common_description_info				\
-							\
 %if %build_devel					\
 %package -n	%{kname}-%{1}-devel-%{buildrel}		\
 Version:	%{fakever}				\
@@ -262,8 +249,6 @@
 							\
 If you want to build your own kernel, you need to install the full \
 %{kname}-source-%{buildrel} rpm.			\
-							\
-%common_description_info				\
 %endif							\
 							\
 %package -n %{kname}-%{1}-latest			\
@@ -280,8 +265,6 @@
 This package is a virtual rpm that aims to make sure you always have the \
 latest %{kname}-%{1} installed...			\
 							\
-%common_description_info				\
-							\
 %if %build_devel					\
 %package -n %{kname}-%{1}-devel-latest			\
 Version:	%{kversion}				\
@@ -296,8 +279,6 @@
 %description -n %{kname}-%{1}-devel-latest		\
 This package is a virtual rpm that aims to make sure you always have the \
 latest %{kname}-%{1}-devel installed...			\
-							\
-%common_description_info				\
 %endif							\
 							\
 %post -n %{kname}-%{1}-%{buildrel} -f kernel_files.%{1}-post \
@@ -459,7 +440,6 @@
 If you only want the files needed to build 3rdparty (nVidia, Ati, dkms-*,...)
 drivers against, install the *-devel-* rpm that is matching your kernel.
 
-%common_description_info
 
 %post -n %{kname}-source-%{buildrel}
 for i in /lib/modules/%{kversion}-%{ktag}-*-%{buildrpmrel}; do
@@ -497,8 +477,6 @@
 %description -n %{kname}-source-latest
 This package is a virtual rpm that aims to make sure you always have the
 latest %{kname}-source installed...
-
-%common_description_info
 %endif
 
 #
@@ -518,8 +496,6 @@
 shipped with it are documented in these files. You also might want install
 this package if you need a reference to the options that can be passed to
 Linux kernel modules at load time.
-
-%common_description_info
 %endif
 
 #