X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=kernel-vanilla.spec;h=4252f5b083f975845e73f7c811b7bc6f4865b76a;hb=e33abc0a027dfcabcd71c7e1b4a231baaa310750;hp=abd54ed3733c2e456611864e39f0d47d93ecb63b;hpb=71f5a841b38705d01bad56e8be487bbf1a22217c;p=packages%2Fkernel.git

diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec
index abd54ed..4252f5b 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.4
+%define		_rel			0.5
 
 %define		_enable_debug_packages			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)