SPECS: madwifi-ng.spec, ndas.spec, open-iscsi.spec, ov511.spec - u...

[glen]

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

---- Files affected:
SPECS:
   madwifi-ng.spec (1.43 -> 1.44) , ndas.spec (1.5 -> 1.6) , open-iscsi.spec (1.6 -> 1.7) , ov511.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/madwifi-ng.spec
diff -u SPECS/madwifi-ng.spec:1.43 SPECS/madwifi-ng.spec:1.44
--- SPECS/madwifi-ng.spec:1.43	Wed Mar  7 13:32:59 2007
+++ SPECS/madwifi-ng.spec	Wed Mar 14 01:23:26 2007
@@ -5,6 +5,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)
@@ -208,9 +209,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-madwifi-ng
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/net/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-net-madwifi-ng
@@ -225,6 +228,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2007/03/14 00:23:26  glen
+- up bcond
+
 Revision 1.43  2007/03/07 12:32:59  mguevara
 - _rel 0.2
 - readded madwifi-ng-makefile-werror.patch

================================================================
Index: SPECS/ndas.spec
diff -u SPECS/ndas.spec:1.5 SPECS/ndas.spec:1.6
--- SPECS/ndas.spec:1.5	Tue Feb 13 08:16:49 2007
+++ SPECS/ndas.spec	Wed Mar 14 01:23:26 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)
@@ -131,9 +132,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-block-ndas
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/block/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-block-ndas
@@ -148,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/03/14 00:23:26  glen
+- up bcond
+
 Revision 1.5  2007/02/13 07:16:49  glen
 - tabs in preamble
 

================================================================
Index: SPECS/open-iscsi.spec
diff -u SPECS/open-iscsi.spec:1.6 SPECS/open-iscsi.spec:1.7
--- SPECS/open-iscsi.spec:1.6	Tue Feb 13 08:16:50 2007
+++ SPECS/open-iscsi.spec	Wed Mar 14 01:23:26 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)
@@ -194,9 +195,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
@@ -211,6 +214,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/03/14 00:23:26  glen
+- up bcond
+
 Revision 1.6  2007/02/13 07:16:50  glen
 - tabs in preamble
 

================================================================
Index: SPECS/ov511.spec
diff -u SPECS/ov511.spec:1.4 SPECS/ov511.spec:1.5
--- SPECS/ov511.spec:1.4	Tue Feb 13 08:16:51 2007
+++ SPECS/ov511.spec	Wed Mar 14 01:23:26 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_with	verbose		# verbose build (V=1)
 #
@@ -101,10 +102,12 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-video-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/%{_module_dir}/*.ko*
 %{_sysconfdir}/modprobe.d/%{_kernel_ver}/%{name}.conf
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-video-%{name}
@@ -120,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2007/03/14 00:23:26  glen
+- up bcond
+
 Revision 1.4  2007/02/13 07:16:51  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/madwifi-ng.spec?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/SPECS/ndas.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/open-iscsi.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/ov511.spec?r1=1.4&r2=1.5&f=u