SPECS (LINUX_2_6_18): kernel-vanilla.spec - try again

[shadzik]

Author: shadzik                      Date: Mon Dec  4 01:22:46 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_18
---- Log message:
- try again

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.14.2.1 -> 1.14.2.2) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.14.2.1 SPECS/kernel-vanilla.spec:1.14.2.2
--- SPECS/kernel-vanilla.spec:1.14.2.1	Mon Dec  4 02:00:23 2006
+++ SPECS/kernel-vanilla.spec	Mon Dec  4 02:22:39 2006
@@ -985,7 +985,7 @@
 %ifnarch sparc
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/char/drm
 %endif
-%if %{have_isa}
+%if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
 /lib/modules/%{ver_rel}/kernel/fs
@@ -996,8 +996,10 @@
 %dir /lib/modules/%{ver_rel}/kernel/sound
 /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
 %if %{have_sound}
+%ifnarch sparc
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
 %endif
+%endif
 %dir /lib/modules/%{ver_rel}/misc
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/pcmcia
@@ -1047,7 +1049,9 @@
 %files sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/sound
+%ifnarch sparc
 /lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
+%endif
 %exclude %dir /lib/modules/%{ver_rel}/kernel/sound
 %exclude /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
 %if %{have_oss}
@@ -1087,7 +1091,7 @@
 %ifnarch sparc
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/char/drm
 %endif
-%if %{have_isa}
+%if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
 /lib/modules/%{ver_rel}smp/kernel/fs
@@ -1098,8 +1102,10 @@
 %dir /lib/modules/%{ver_rel}smp/kernel/sound
 /lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
 %if %{have_sound}
+%ifnarch sparc
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/video/*/*-alsa.ko*
 %endif
+%endif
 %dir /lib/modules/%{ver_rel}smp/misc
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/pcmcia
@@ -1149,7 +1155,9 @@
 %files smp-sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/sound
+%ifnarch sparc
 /lib/modules/%{ver_rel}smp/kernel/drivers/media/video/*/*-alsa.ko*
+%endif
 %exclude %dir /lib/modules/%{ver_rel}smp/kernel/sound
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
 %if %{have_oss}
@@ -1246,6 +1254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14.2.2  2006/12/04 01:22:39  shadzik
+- try again
+
 Revision 1.14.2.1  2006/12/04 01:00:23  shadzik
 - better sound packaging for sparc
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-vanilla.spec?r1=1.14.2.1&r2=1.14.2.2&f=u