kernel: udpate to 2.6.35.13, drop i586 config, build noarch on i686 build

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3745 ec354946-7b23-47d6-9f5a-488ba84defc7

k/kernel/kernel-vl.spec

@@ -25,10 +25,10 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # adding some text to the end of the version number.
 #
 %define sublevel 35
-%define patchlevel 12
+%define patchlevel 13
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release 12%{?_dist_release}
+%define release 14%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -37,7 +37,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define KVERREL %{rpmversion}-%{release}
 
 # groups of related archs
-%define all_x86 i386 i586 i686 athlon
+%define all_x86 i686
 %define all_ppc ppciseries ppcpseries ppc ppc64
 
 # Override generic defaults with per-arch defaults 
@@ -53,24 +53,21 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-*.config
 %endif
 
-# Second, per-architecture exclusions (ifarch)
-%ifarch i686 i586 athlon
-%define buildsource 0
-%define builddoc 0
-%define with_headers 0
-%endif
-
 %ifarch i686
 %define buildpae 1
 %endif
 
 # build x86 headers on i686 build
+# build noarch package with i686 build
 %ifarch i686
 %define with_headers 1
+%define buildsource 1
+%define builddoc 1
+%define with_firmware 1
 %endif
 
 %ifarch %{all_x86}
-%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i?86*.config
+%define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-i686*.config
 %define image_install_path boot
 %define hdrarch i386
 %define asmarch x86
@@ -160,7 +157,7 @@ Group: System Environment/Kernel
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 %{all_ppc} sparc sparc64 ia64
+ExclusiveArch: noarch i686 x86_64 %{all_ppc}
 ExclusiveOS: Linux
 Provides: kernel = %{rpmversion}
 Provides: kernel26 = %{rpmversion}
@@ -196,7 +193,6 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
 Source10: COPYING.modules
 Source11: genkey
 
-Source20: kernel-%{kversion}-i586.config
 Source21: kernel-%{kversion}-i686.config
 Source22: kernel-%{kversion}-i686-pae.config
 Source23: kernel-%{kversion}-x86_64.config
@@ -263,6 +259,9 @@ Patch2301: linux-2.6.23-VMWare5-fix-LSI_emulation.patch
 Patch2504: linux-2.6-at76.patch
 
 # DRM
+# fix emit batch buffer regression
+Patch2700: drm-i915-fix-emit-batch-buffer-regression.patch
+
 # revert patch
 Patch2800: drm-nouveau-reverts.patch
 #
@@ -310,7 +309,7 @@ Patch6031: unionfs-2.5.8-open-unlink-ftruncate-crash-fix.patch
 
 #
 # TuxOnIce (formerly suspend2) patch
-%define tuxonice_version 3.2-rc2-for-2.6.35.12
+%define tuxonice_version 3.2-rc2-for-2.6.35.13
 Patch9000: tuxonice-%{tuxonice_version}.patch.bz2
 
 #
@@ -606,6 +605,7 @@ cd linux-%{kversion}
 %patch2504 -p1
 
 # drm fixes
+%patch2700 -p1 -b .fix-emit-batch-buffer-regression
 %if %{_apply_drm_patches}
 %patch2800 -p1 -b .drm-nouveau-reverts
 %patch2801 -p1 -b .drm-polling-fixes
@@ -655,8 +655,8 @@ cd linux-%{kversion}
 %patch6031 -p1 -b .open-unlink-ftruncate-crash-fix
 %endif
 
-# tuxonice (suspend2)
-%patch9000 -p1
+# tuxonice
+%patch9000 -p1 -b .tuxonice
 
 #
 # final stuff
@@ -1007,7 +1007,7 @@ fi
 depmod -a -F /boot/System.map-%{KVERREL} %{KVERREL}
 
 # if preffered bootloader is LILO, execute lilo.
-%ifarch i386 i586 i686 athlon
+%ifarch i586 i686
 if [ -f /etc/sysconfig/bootloader ]; then
   source /etc/sysconfig/bootloader
   if [ "$BOOTLOADER" = "lilo" ]; then
@@ -1060,7 +1060,7 @@ if [ -f $GRUB_MENULST ]; then
 fi
 
 # if preffered bootloader is LILO, execute lilo.
-%ifarch i386 i586 i686 athlon x86_64
+%ifarch i586 i686 x86_64
 if [ -f /etc/sysconfig/bootloader ]; then
   source /etc/sysconfig/bootloader
   if [ "$BOOTLOADER" = "lilo" ]; then
@@ -1159,6 +1159,13 @@ fi
 
 
 %changelog
+* Sat Apr 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-14
+- drop i586 config
+- build kernel-{source,doc,firmware}.noarch package on i686 build
+
+* Sat Apr 30 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-13
+- update to 2.6.35.13
+
 * Wed Apr 27 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-12
 - update configs
   - enable CONFIG_DEVPTS_MULTIPLE_INSTANCES