X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=c213e758447f9897d4095897d7cd52e81ebe840d;hb=refs%2Fheads%2FLINUX_2_6_32;hp=2dabbb56882f18ffbc948db96253bdebd6b1d54f;hpb=201f553ff6e3fcdd59415e4e026c258781cbc24c;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index 2dabbb5..c213e75 100644
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -4,14 +4,9 @@
 
 %{?debug:%define with_verbose 1}
 
-%define		have_drm	1
-%define		have_oss	1
-%define		have_sound	1
-%define		have_isa	1
-
 %define		_basever		2.6.32
-%define		_postver		.56
-%define		_rel			0.2
+%define		_postver		.59
+%define		_rel			2
 
 %define		_enable_debug_packages			0
 
@@ -38,7 +33,7 @@ Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}.tar.bz2
 # Source0-md5:	260551284ac224c3a43c4adac7df4879
 %if "%{_postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.32/patch-%{version}.bz2
-# Source1-md5:	53394bf7139e25ca328f7894ad21d1ad
+# Source1-md5:	66391ee9becfb0152baaf4fdae1430f4
 %endif
 
 Source2:	kernel-vanilla-autoconf.h
@@ -60,11 +55,11 @@ BuildRequires:	rpmbuild(macros) >= 1.217
 Autoreqprov:	no
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 2.57
-Requires(post):	module-init-tools >= 0.9.9
+Requires(post):	virtual(module-tools)
 Requires:	/sbin/depmod
 Requires:	coreutils
 Requires:	geninitrd >= 2.57
-Requires:	module-init-tools >= 0.9.9
+Requires:	virtual(module-tools)
 Obsoletes:	kernel%{_alt_kernel}-firmware
 Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
 Obsoletes:	kernel-misc-acer_acpi
@@ -79,7 +74,7 @@ Obsoletes:	kernel-smp
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
-Conflicts:	module-init-tools < 0.9.10
+Conflicts:	module-init-tools < 3.16
 Conflicts:	nfs-utils < 1.0.5
 Conflicts:	oprofile < 0.9
 Conflicts:	ppp < 1:2.4.0
@@ -367,7 +362,7 @@ TuneUpConfigForIX86 () {
 	%ifarch i586
 	sed -i "s:# CONFIG_HIGHMEM4G is not set:CONFIG_HIGHMEM4G=y:" $1
 	sed -i "s:CONFIG_HIGHMEM64G=y:# CONFIG_HIGHMEM64G is not set:" $1
-	sed -i "d:CONFIG_X86_PAE=y:" $1
+	sed -i ":CONFIG_X86_PAE=y:d" $1
 	%else
 	sed -i 's:CONFIG_M586=y# CONFIG_M586 is not set::' $1
 	sed -i 's:# CONFIG_M686 is not set:CONFIG_M686=y:' $1
@@ -618,9 +613,7 @@ fi
 /lib/modules/%{kernel_release}/kernel/arch
 /lib/modules/%{kernel_release}/kernel/crypto
 /lib/modules/%{kernel_release}/kernel/drivers
-%if %{have_drm}
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/gpu/drm
-%endif
 /lib/modules/%{kernel_release}/kernel/fs
 
 # this directory will be removed after disabling rcutorture mod. in 2.6.20.
@@ -631,14 +624,12 @@ fi
 /lib/modules/%{kernel_release}/kernel/mm
 %endif
 /lib/modules/%{kernel_release}/kernel/net
-%if %{have_sound}
 %dir /lib/modules/%{kernel_release}/kernel/sound
 /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko*
 /lib/modules/%{kernel_release}/kernel/sound/sound*.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/cx88/cx88-alsa.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/em28xx/em28xx-alsa.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko*
-%endif
 %dir /lib/modules/%{kernel_release}/misc
 %dir /lib/modules/%{kernel_release}/kernel/drivers/pcmcia
 /lib/modules/%{kernel_release}/kernel/drivers/pcmcia/pcmcia*ko*
@@ -668,11 +659,9 @@ fi
 %defattr(644,root,root,755)
 /boot/vmlinux-%{kernel_release}
 
-%if %{have_drm}
 %files drm
 %defattr(644,root,root,755)
 /lib/modules/%{kernel_release}/kernel/drivers/gpu/drm
-%endif
 
 %files pcmcia
 %defattr(644,root,root,755)
@@ -692,27 +681,21 @@ fi
 /lib/modules/%{kernel_release}/kernel/drivers/serial/serial_cs.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 
-%if %{have_sound}
 %files sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{kernel_release}/kernel/sound
 %exclude %dir /lib/modules/%{kernel_release}/kernel/sound
 %exclude /lib/modules/%{kernel_release}/kernel/sound/ac97_bus.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/sound/sound*.ko*
-%if %{have_oss}
 %exclude /lib/modules/%{kernel_release}/kernel/sound/oss
-%endif
 /lib/modules/%{kernel_release}/kernel/drivers/usb/gadget/g_midi.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/media/video/cx88/cx88-alsa.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/media/video/em28xx/em28xx-alsa.ko*
 /lib/modules/%{kernel_release}/kernel/drivers/media/video/saa7134/saa7134-alsa.ko*
 
-%if %{have_oss}
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{kernel_release}/kernel/sound/oss
-%endif
-%endif
 
 %files headers
 %defattr(644,root,root,755)