SPECS (LINUX_2_6_18): kernel-vanilla.spec - better sound packaging...

[shadzik]

Author: shadzik                      Date: Mon Dec  4 01:00:28 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_18
---- Log message:
- better sound packaging for sparc

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

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.14 SPECS/kernel-vanilla.spec:1.14.2.1
--- SPECS/kernel-vanilla.spec:1.14	Mon Dec  4 01:00:39 2006
+++ SPECS/kernel-vanilla.spec	Mon Dec  4 02:00:23 2006
@@ -23,15 +23,13 @@
 
 %ifarch sparc sparc64
 %define		have_pcmcia	0
+%define		have_oss	0
 %else
 %define		have_pcmcia	1
+%define		have_oss	1
 %endif
 
-%ifarch sparc
-%define		have_sound	0
-%else
 %define		have_sound	1
-%endif
 
 ## Program required by kernel to work.
 %define		_binutils_ver		2.12.1
@@ -1052,17 +1050,21 @@
 /lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
 %exclude %dir /lib/modules/%{ver_rel}/kernel/sound
 %exclude /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
+%if %{have_oss}
 %exclude /lib/modules/%{ver_rel}/kernel/sound/oss
+%endif
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}/kernel/sound/pcmcia
 %endif
 
+%if %{have_oss}
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/sound/oss
 %if %{have_isa}
 /lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
+%endif			# %{have_oss}
 %endif			# %{have_sound}
 %endif			# %%{with up}
 
@@ -1150,17 +1152,21 @@
 /lib/modules/%{ver_rel}smp/kernel/drivers/media/video/*/*-alsa.ko*
 %exclude %dir /lib/modules/%{ver_rel}smp/kernel/sound
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
+%if %{have_oss}
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/oss
+%endif
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/pcmcia
 %endif
 
+%if %{have_oss}
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/sound/oss
 %if %{have_isa}
 /lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
+%endif			# %{have_oss}
 %endif			# %{have_sound}
 %endif			# %{with_smp}
 
@@ -1240,6 +1246,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14.2.1  2006/12/04 01:00:23  shadzik
+- better sound packaging for sparc
+
 Revision 1.14  2006/12/04 00:00:39  shadzik
 - BR goes for sparc32 too
 
================================================================

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