SPECS (LINUX_2_6): kernel.spec - up to 2.6.24.6 - reverted "little...

[zbyniu]

Author: zbyniu                       Date: Mon May  5 23:11:02 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- up to 2.6.24.6
- reverted "little fix for /boot symlinks (support alt_kernel, drop .old trash)" from rel 1.441.2.1862

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1886 -> 1.441.2.1887) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1886 SPECS/kernel.spec:1.441.2.1887
--- SPECS/kernel.spec:1.441.2.1886	Mon May  5 09:48:05 2008
+++ SPECS/kernel.spec	Tue May  6 01:10:56 2008
@@ -112,11 +112,11 @@
 %endif
 
 %define		_basever		2.6.24
-%define		_postver		.5
+%define		_postver		.6
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.3
+%define		_rel			0.1
 
 %define		_enable_debug_packages			0
 
@@ -167,7 +167,7 @@
 %endif
 %if "%{_postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	e937c732891561f0a34a2e0853df825e
+# Source1-md5:	6c93ad526ccb10632ced0d37fa8e0ee5
 %endif
 
 Source3:	kernel-autoconf.h
@@ -220,7 +220,7 @@
 
 # ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.21.diff.gz
 Patch3:		linux-2.6-bootsplash.patch
-# http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.24-rc7.patch
+# based on http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.24-rc7.patch
 Patch4:		kernel-fbcondecor.patch
 
 # http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tgz
@@ -1410,15 +1410,19 @@
 
 %post
 %ifarch ia64
-ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz%{_alt_kernel}
+mv -f /boot/efi/vmlinuz /boot/efi/vmlinuz.old 2> /dev/null > /dev/null
+ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz
 %endif
-ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz%{_alt_kernel}
-ln -sf System.map-%{kernel_release} /boot/System.map%{_alt_kernel}
+mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
+mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
+ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
+ln -sf System.map-%{kernel_release} /boot/System.map
 
 %depmod %{kernel_release}
 
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
-ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd%{_alt_kernel}
+mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2> /dev/null > /dev/null
+ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd
 
 if [ -x /sbin/new-kernel-pkg ]; then
 	if [ -f /etc/pld-release ]; then
@@ -1438,7 +1442,8 @@
 fi
 
 %post vmlinux
-ln -sf vmlinux-%{kernel_release} /boot/vmlinux%{_alt_kernel}
+mv -f /boot/vmlinux /boot/vmlinux.old 2> /dev/null > /dev/null
+ln -sf vmlinux-%{kernel_release} /boot/vmlinux
 
 %post libs
 %{_sbindir}/mkvmlinuz /boot/zImage-%{kernel_release} %{kernel_release}
@@ -1704,6 +1709,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1887  2008-05-05 23:10:56  zbyniu
+- up to 2.6.24.6
+- reverted "little fix for /boot symlinks (support alt_kernel, drop .old trash)" from rel 1.441.2.1862
+
 Revision 1.441.2.1886  2008-05-05 07:48:05  pluto
 - move saa7134-oss.ko to sound-oss subpackage.
 
================================================================

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