SPECS: CapOver.spec, VMware-server.spec, VMware-workstation.spec, ...

[glen]

Author: glen                         Date: Wed Mar 14 00:14:03 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up bcond

---- Files affected:
SPECS:
   CapOver.spec (1.9 -> 1.10) , VMware-server.spec (1.23 -> 1.24) , VMware-workstation.spec (1.106 -> 1.107) , X11-driver-firegl.spec (1.147 -> 1.148) , adm8211.spec (1.15 -> 1.16) , atmelwlandriver.spec (1.47 -> 1.48) , bcm5700.spec (1.54 -> 1.55) , btsco.spec (1.17 -> 1.18) , cdemu.spec (1.12 -> 1.13) , cisco-vpnclient.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/CapOver.spec
diff -u SPECS/CapOver.spec:1.9 SPECS/CapOver.spec:1.10
--- SPECS/CapOver.spec:1.9	Mon Feb 12 22:21:30 2007
+++ SPECS/CapOver.spec	Wed Mar 14 01:13:57 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace module
 #
@@ -146,9 +147,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-cap_over
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-misc-cap_over
@@ -163,6 +166,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.9  2007/02/12 21:21:30  glen
 - tabs in preamle
 

================================================================
Index: SPECS/VMware-server.spec
diff -u SPECS/VMware-server.spec:1.23 SPECS/VMware-server.spec:1.24
--- SPECS/VMware-server.spec:1.23	Mon Feb 12 22:23:45 2007
+++ SPECS/VMware-server.spec	Wed Mar 14 01:13:57 2007
@@ -19,6 +19,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# without UP kernel modules
 %bcond_without	smp		# without SMP kernel modules
 %bcond_without	userspace	# don't build userspace utilities
 %bcond_with	kernel24	# build kernel24 modules (disable kernel26)
@@ -721,7 +722,8 @@
 %endif
 
 %if %{with kernel}
-%if !%{with kernel24}
+%if %{without kernel24}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
@@ -729,6 +731,7 @@
 %files -n kernel-misc-vmnet
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmnet.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files	-n kernel-smp-misc-vmmon
@@ -769,6 +772,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.23  2007/02/12 21:23:45  glen
 - tabs in preamble
 

================================================================
Index: SPECS/VMware-workstation.spec
diff -u SPECS/VMware-workstation.spec:1.106 SPECS/VMware-workstation.spec:1.107
--- SPECS/VMware-workstation.spec:1.106	Mon Feb 12 22:23:45 2007
+++ SPECS/VMware-workstation.spec	Wed Mar 14 01:13:57 2007
@@ -7,6 +7,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# without UP kernel modules
 %bcond_without	smp		# without SMP kernel modules
 %bcond_without	userspace	# don't build userspace utilities
 %bcond_with	kernel24	# build kernel24 modules (disable kernel26)
@@ -573,7 +574,8 @@
 %endif
 
 %if %{with kernel}
-%if !%{with kernel24}
+%if %{without kernel24}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-vmmon
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmmon.ko*
@@ -581,6 +583,7 @@
 %files -n kernel%{_alt_kernel}-misc-vmnet
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/vmnet.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files	-n kernel%{_alt_kernel}-smp-misc-vmmon
@@ -621,6 +624,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.106  2007/02/12 21:23:45  glen
 - tabs in preamble
 

================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.147 SPECS/X11-driver-firegl.spec:1.148
--- SPECS/X11-driver-firegl.spec:1.147	Mon Feb 26 11:18:04 2007
+++ SPECS/X11-driver-firegl.spec	Wed Mar 14 01:13:57 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	verbose		# verbose build (V=1)
@@ -235,9 +236,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-video-firegl
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-video-firegl
@@ -252,6 +255,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.147  2007/02/26 10:18:04  matkor
 - Release 1. First working GLX and DRI on ATI Radeon XPRESS 200M 5955 (PCIE) since last year. Kernel 2.6.20.
 

================================================================
Index: SPECS/adm8211.spec
diff -u SPECS/adm8211.spec:1.15 SPECS/adm8211.spec:1.16
--- SPECS/adm8211.spec:1.15	Mon Feb 12 22:23:46 2007
+++ SPECS/adm8211.spec	Wed Mar 14 01:13:57 2007
@@ -4,6 +4,7 @@
 
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
@@ -107,9 +108,11 @@
 %postun -n kernel-smp-net-adm8211
 %depmod %{_kernel_ver}smp
 
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-net-adm8211
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-adm8211
@@ -123,6 +126,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.15  2007/02/12 21:23:46  glen
 - tabs in preamble
 

================================================================
Index: SPECS/atmelwlandriver.spec
diff -u SPECS/atmelwlandriver.spec:1.47 SPECS/atmelwlandriver.spec:1.48
--- SPECS/atmelwlandriver.spec:1.47	Mon Feb 12 22:23:48 2007
+++ SPECS/atmelwlandriver.spec	Wed Mar 14 01:13:57 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# don't build UP modules
 %bcond_without	smp		# don't build SMP modules
 %bcond_with	unicode		# use wx-gtk2-unicode-config instead of ansi
 %bcond_without	userspace	# don't build userspace applications
@@ -271,6 +272,7 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-net-atmelwlandriver
 %defattr(644,root,root,755)
 %doc CHANGES README
@@ -279,6 +281,7 @@
 %attr(755,root,root) %{_sbindir}/fastvnet.sh
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/pcmcia/*.ko*
 /lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-atmelwlandriver
@@ -315,6 +318,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.47  2007/02/12 21:23:48  glen
 - tabs in preamble
 

================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.54 SPECS/bcm5700.spec:1.55
--- SPECS/bcm5700.spec:1.54	Mon Feb 12 22:23:49 2007
+++ SPECS/bcm5700.spec	Wed Mar 14 01:13:57 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
@@ -158,9 +159,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-net-bcm5700
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm5700.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-bcm5700
@@ -175,6 +178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.54  2007/02/12 21:23:49  glen
 - tabs in preamble
 

================================================================
Index: SPECS/btsco.spec
diff -u SPECS/btsco.spec:1.17 SPECS/btsco.spec:1.18
--- SPECS/btsco.spec:1.17	Mon Feb 12 22:23:49 2007
+++ SPECS/btsco.spec	Wed Mar 14 01:13:57 2007
@@ -4,6 +4,7 @@
 %bcond_without	dist_kernel	# without kernel from distribution
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace utilities
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
@@ -147,10 +148,12 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-char-btsco
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/snd-bt-sco.ko.gz
 %endif
+%endif
 
 %if %{with smp}
 %files -n kernel%{_alt_kernel}-smp-char-btsco
@@ -164,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.17  2007/02/12 21:23:49  glen
 - tabs in preamble
 

================================================================
Index: SPECS/cdemu.spec
diff -u SPECS/cdemu.spec:1.12 SPECS/cdemu.spec:1.13
--- SPECS/cdemu.spec:1.12	Mon Feb 12 22:23:50 2007
+++ SPECS/cdemu.spec	Wed Mar 14 01:13:57 2007
@@ -2,7 +2,8 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
-%bcond_without	smp		# without smp packages
+%bcond_without	up		# without UP packages
+%bcond_without	smp		# without SMP packages
 %bcond_without	kernel		# without kernel packages
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_without	userspace	# don't build userspace tools
@@ -139,9 +140,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/cdemu.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-misc-%{name}
@@ -164,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.12  2007/02/12 21:23:50  glen
 - tabs in preamble
 

================================================================
Index: SPECS/cisco-vpnclient.spec
diff -u SPECS/cisco-vpnclient.spec:1.18 SPECS/cisco-vpnclient.spec:1.19
--- SPECS/cisco-vpnclient.spec:1.18	Mon Feb 12 22:23:50 2007
+++ SPECS/cisco-vpnclient.spec	Wed Mar 14 01:13:57 2007
@@ -4,6 +4,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
+%bcond_without	up		# don't build UP module
 %bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	verbose		# verbose build (V=1)
@@ -186,9 +187,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-net-cisco_ipsec
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-cisco_ipsec
@@ -203,6 +206,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2007/03/14 00:13:57  glen
+- up bcond
+
 Revision 1.18  2007/02/12 21:23:50  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/CapOver.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/VMware-server.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.106&r2=1.107&f=u
    http://cvs.pld-linux.org/SPECS/X11-driver-firegl.spec?r1=1.147&r2=1.148&f=u
    http://cvs.pld-linux.org/SPECS/adm8211.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/atmelwlandriver.spec?r1=1.47&r2=1.48&f=u
    http://cvs.pld-linux.org/SPECS/bcm5700.spec?r1=1.54&r2=1.55&f=u
    http://cvs.pld-linux.org/SPECS/btsco.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/cdemu.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/cisco-vpnclient.spec?r1=1.18&r2=1.19&f=u