SPECS: linux-iscsi.spec, linux-wlan-ng.spec, linuxwacom.spec - up ...

[glen]

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

---- Files affected:
SPECS:
   linux-iscsi.spec (1.37 -> 1.38) , linux-wlan-ng.spec (1.45 -> 1.46) , linuxwacom.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/linux-iscsi.spec
diff -u SPECS/linux-iscsi.spec:1.37 SPECS/linux-iscsi.spec:1.38
--- SPECS/linux-iscsi.spec:1.37	Tue Feb 13 07:46:52 2007
+++ SPECS/linux-iscsi.spec	Wed Mar 14 01:17:58 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 module
 %bcond_with	verbose		# verbose build (V=1)
@@ -198,9 +199,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-iscsi
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-iscsi
@@ -215,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2007/03/14 00:17:58  glen
+- up bcond
+
 Revision 1.37  2007/02/13 06:46:52  glen
 - tabs in preamble
 

================================================================
Index: SPECS/linux-wlan-ng.spec
diff -u SPECS/linux-wlan-ng.spec:1.45 SPECS/linux-wlan-ng.spec:1.46
--- SPECS/linux-wlan-ng.spec:1.45	Tue Feb 13 07:46:52 2007
+++ SPECS/linux-wlan-ng.spec	Wed Mar 14 01:17:58 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 module
 %bcond_with	verbose		# verbose build (V=1)
@@ -283,6 +284,7 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-net-wlan-ng
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/p80211.ko*
@@ -293,6 +295,7 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/prism2_cs.ko*
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/prism2_plx.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-wlan-ng
@@ -314,6 +317,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007/03/14 00:17:58  glen
+- up bcond
+
 Revision 1.45  2007/02/13 06:46:52  glen
 - tabs in preamble
 

================================================================
Index: SPECS/linuxwacom.spec
diff -u SPECS/linuxwacom.spec:1.18 SPECS/linuxwacom.spec:1.19
--- SPECS/linuxwacom.spec:1.18	Tue Feb 13 07:46:52 2007
+++ SPECS/linuxwacom.spec	Wed Mar 14 01:17:58 2007
@@ -3,11 +3,12 @@
 # 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)
 
-%if !%{with kernel}
+%if %{without kernel}
 %undefine       with_dist_kernel
 %endif
 
@@ -217,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2007/03/14 00:17:58  glen
+- up bcond
+
 Revision 1.18  2007/02/13 06:46:52  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-iscsi.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/linux-wlan-ng.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SPECS/linuxwacom.spec?r1=1.18&r2=1.19&f=u