SPECS (LINUX_2_6): kernel.spec - simplified files conditions using...

Mon Dec 12 15:12:45 CET 2005

Author: qboosh                       Date: Mon Dec 12 14:12:45 2005 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- simplified files conditions using with_*/have_* defines

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1340 -> 1.441.2.1341) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1340 SPECS/kernel.spec:1.441.2.1341

--- SPECS/kernel.spec:1.441.2.1340	Mon Dec 12 11:16:38 2005
+++ SPECS/kernel.spec	Mon Dec 12 15:12:39 2005
@@ -39,12 +39,6 @@
 %define with_grsec_basic 1
 %endif
 
-%ifarch %{x8664}
-%if %{with xendev}
-%undefine	with_pcmcia
-%endif
-%endif
-
 %if %{with xendev} && %{without xen}
 cannot build xendev kernel without xen0/xenU
 %endif
@@ -98,6 +92,33 @@
 %undefine	with_smp
 %endif
 
+%ifarch %{x8664}
+%if %{with xendev}
+%undefine	with_pcmcia
+%endif
+%endif
+
+%define		have_drm	1
+%define		have_oss	1
+%define		have_sound	1
+
+%ifnarch %{ix86}
+%undefine	with_abi
+%endif
+
+%ifarch sparc sparc64
+%undefine	with_pcmcia
+%define		have_drm	0
+%define		have_oss	0
+%endif
+
+%if %{with xenU}
+%undefine	with_pcmcia
+%define		have_drm	0
+%define		have_oss	0
+%define		have_sound	0
+%endif
+
 ## Program required by kernel to work.
 %define		_binutils_ver		2.12
 %define		_util_linux_ver		2.10o
@@ -1431,10 +1452,8 @@
 %dir /lib/modules/%{version}-%{release}
 %dir /lib/modules/%{version}-%{release}/kernel
 %if %{with abi}
-%ifarch %{ix86}
 /lib/modules/%{version}-%{release}/kernel/abi
 %endif
-%endif
 %ifnarch sparc
 /lib/modules/%{version}-%{release}/kernel/arch
 %endif
@@ -1444,15 +1463,12 @@
 /lib/modules/%{version}-%{release}/kernel/lib
 /lib/modules/%{version}-%{release}/kernel/net
 /lib/modules/%{version}-%{release}/kernel/security
-%if !%{with xenU}
+%if %{have_sound}
 %dir /lib/modules/%{version}-%{release}/kernel/sound
 /lib/modules/%{version}-%{release}/kernel/sound/soundcore.*
 %endif
 %dir /lib/modules/%{version}-%{release}/misc
-%if !%{with xenU}
 %if %{with pcmcia}
-%ifnarch sparc sparc64
-#pcmcia stuff
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/pcmcia
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/*/pcmcia
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/bluetooth/*_cs.ko*
@@ -1460,24 +1476,19 @@
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/parport/parport_cs.ko*
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/serial/serial_cs.ko*
 %endif
-%endif
-%ifnarch sparc sparc64
-#drm stuff
+%if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/char/drm
 %endif
-%endif		# %%{with xenU}
 /lib/modules/%{version}-%{release}/build
 %ghost /lib/modules/%{version}-%{release}/modules.*
 
-%if !%{with xenU}
-%ifnarch sparc sparc64
+%if %{have_drm}
 %files drm
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}/kernel/drivers/char/drm
 %endif
 
 %if %{with pcmcia}
-%ifnarch sparc sparc64
 %files pcmcia
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}/kernel/drivers/pcmcia
@@ -1487,7 +1498,6 @@
 /lib/modules/%{version}-%{release}/kernel/drivers/parport/parport_cs.ko*
 /lib/modules/%{version}-%{release}/kernel/drivers/serial/serial_cs.ko*
 %endif
-%endif
 
 %ifarch ppc
 %if "%{_arch}" == "ppc"
@@ -1506,22 +1516,23 @@
 %endif
 %endif
 
+%if %{have_sound}
 %files sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}/kernel/sound
 %exclude %dir /lib/modules/%{version}-%{release}/kernel/sound
 %exclude /lib/modules/%{version}-%{release}/kernel/sound/soundcore.*
-%ifnarch sparc sparc64
+%if %{have_oss}
 %exclude /lib/modules/%{version}-%{release}/kernel/sound/oss
 %endif
 
-%ifnarch sparc sparc64
+%if %{have_oss}
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}/kernel/sound/oss
 %endif
+%endif			# %%{have_sound}
 %endif			# %%{with up}
-%endif			# %%{with xenU}
 
 %if %{with smp}
 %files smp
@@ -1539,10 +1550,8 @@
 %dir /lib/modules/%{version}-%{release}smp
 %dir /lib/modules/%{version}-%{release}smp/kernel
 %if %{with abi}
-%ifarch %{ix86}
 /lib/modules/%{version}-%{release}smp/kernel/abi
 %endif
-%endif
 %ifnarch sparc
 /lib/modules/%{version}-%{release}smp/kernel/arch
 %endif
@@ -1552,12 +1561,12 @@
 /lib/modules/%{version}-%{release}smp/kernel/lib
 /lib/modules/%{version}-%{release}smp/kernel/net
 /lib/modules/%{version}-%{release}smp/kernel/security
+%if %{have_sound}
 %dir /lib/modules/%{version}-%{release}smp/kernel/sound
 /lib/modules/%{version}-%{release}smp/kernel/sound/soundcore.*
+%endif
 %dir /lib/modules/%{version}-%{release}smp/misc
 %if %{with pcmcia}
-%ifnarch sparc sparc64
-#pcmcia stuff
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/pcmcia
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/*/pcmcia
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/bluetooth/*_cs.ko*
@@ -1565,22 +1574,19 @@
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/parport/parport_cs.ko*
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/serial/serial_cs.ko*
 %endif
-%endif
-%ifnarch sparc sparc64
-#drm stuff
+%if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
 %endif
 /lib/modules/%{version}-%{release}smp/build
 %ghost /lib/modules/%{version}-%{release}smp/modules.*
 
-%ifnarch sparc sparc64
+%if %{have_drm}
 %files smp-drm
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
 %endif
 
 %if %{with pcmcia}
-%ifnarch sparc sparc64
 %files smp-pcmcia
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}smp/kernel/drivers/pcmcia
@@ -1590,7 +1596,6 @@
 /lib/modules/%{version}-%{release}smp/kernel/drivers/parport/parport_cs.ko*
 /lib/modules/%{version}-%{release}smp/kernel/drivers/serial/serial_cs.ko*
 %endif
-%endif
 
 %ifarch ppc
 %if "%{_arch}" == "ppc"
@@ -1609,20 +1614,22 @@
 %endif
 %endif
 
+%if %{have_sound}
 %files smp-sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}smp/kernel/sound
 %exclude %dir /lib/modules/%{version}-%{release}smp/kernel/sound
 %exclude /lib/modules/%{version}-%{release}smp/kernel/sound/soundcore.*
-%ifnarch sparc sparc64
+%if %{have_oss}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/sound/oss
 %endif
 
-%ifnarch sparc sparc64
+%if %{have_oss}
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}smp/kernel/sound/oss
 %endif
+%endif			# %%{have_sound}
 %endif			# %%{with smp}
 
 %files headers
@@ -1664,10 +1671,8 @@
 %files source
 %defattr(644,root,root,755)
 %if %{with abi}
-%ifarch %{ix86}
 %{_prefix}/src/linux-%{version}/abi
 %endif
-%endif
 %{_prefix}/src/linux-%{version}/arch/*/[!Mk]*
 %{_prefix}/src/linux-%{version}/arch/*/kernel/[!M]*
 %exclude %{_prefix}/src/linux-%{version}/arch/*/kernel/asm-offsets.*
@@ -1710,6 +1715,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1341  2005/12/12 14:12:39  qboosh
+- simplified files conditions using with_*/have_* defines
+
 Revision 1.441.2.1340  2005/12/12 10:16:38  qboosh
 - added swim3-spinlock patch (from git), should fix unresolved symbols in swim3
 
================================================================

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


