SPECS (LINUX_2_6): kernel.spec - miropcm20 existence depends on IS...

[qboosh]

Author: qboosh                       Date: Mon Dec 12 16:53:11 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- miropcm20 existence depends on ISA (beside OSS)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1344 -> 1.441.2.1345) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1344 SPECS/kernel.spec:1.441.2.1345
--- SPECS/kernel.spec:1.441.2.1344	Mon Dec 12 15:38:14 2005
+++ SPECS/kernel.spec	Mon Dec 12 17:53:04 2005
@@ -4,11 +4,6 @@
 #
 #		- add distcc support (and don't break crossbuild!)
 #		- move em8300 stuff to separeated specs
-# ppc:
-# [and without sound-oss installed (probably all archs - move to -sound-oss?)]
-# drivers/media/radio/miropcm20.ko.gz needs unknown symbol aci_version
-# drivers/media/radio/miropcm20.ko.gz needs unknown symbol aci_port
-# drivers/media/radio/miropcm20.ko.gz needs unknown symbol aci_rw_cmd
 #
 # Conditional build:
 %bcond_without	smp		# don't build SMP kernel
@@ -102,6 +97,12 @@
 %define		have_oss	1
 %define		have_sound	1
 
+%ifarch %{ix86} alpha ppc
+%define		have_isa	1
+%else
+%define		have_isa	0
+%endif
+
 %ifnarch %{ix86}
 %undefine	with_abi
 %endif
@@ -1462,7 +1463,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/char/drm
 %endif
-%if %{have_oss}
+%if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 /lib/modules/%{version}-%{release}/kernel/fs
@@ -1543,8 +1544,10 @@
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}/kernel/sound/oss
+%if %{have_isa}
 /lib/modules/%{version}-%{release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
+%endif
 %endif			# %%{have_sound}
 %endif			# %%{with up}
 
@@ -1574,7 +1577,7 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
 %endif
-%if %{have_oss}
+%if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 /lib/modules/%{version}-%{release}smp/kernel/fs
@@ -1655,8 +1658,10 @@
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}smp/kernel/sound/oss
+%if %{have_isa}
 /lib/modules/%{version}-%{release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
+%endif
 %endif			# %%{have_sound}
 %endif			# %%{with smp}
 
@@ -1743,6 +1748,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1345  2005/12/12 16:53:04  qboosh
+- miropcm20 existence depends on ISA (beside OSS)
+
 Revision 1.441.2.1344  2005/12/12 14:38:14  qboosh
 - rel 2.6
 
================================================================

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