SPECS: kernel-block-gnbd.spec, kernel-char-frandom.spec, kernel-cl...

Sat Mar 17 12:51:16 CET 2007

Author: glen                         Date: Sat Mar 17 11:51:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- with up bcond

---- Files affected:
SPECS:
   kernel-block-gnbd.spec (1.13 -> 1.14) , kernel-char-frandom.spec (1.9 -> 1.10) , kernel-cluster-cman.spec (1.17 -> 1.18) , pwc.spec (1.20 -> 1.21) , pwcx.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/kernel-block-gnbd.spec
diff -u SPECS/kernel-block-gnbd.spec:1.13 SPECS/kernel-block-gnbd.spec:1.14

--- SPECS/kernel-block-gnbd.spec:1.13	Tue Feb 13 09:06:37 2007
+++ SPECS/kernel-block-gnbd.spec	Sat Mar 17 12:51:10 2007
@@ -2,7 +2,8 @@
 #
 # Condtional 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_with	verbose		# verbose build (V=1)
 #
 %define _rel	0.3
@@ -132,9 +133,11 @@
 %postun -n kernel%{_alt_kernel}-smp-block-gnbd
 %depmod %{_kernel_ver}smp
 
+%if %{with up} || %{without dist_kernel}
 %files
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/block/gnbd
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-block-gnbd
@@ -148,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007/03/17 11:51:10  glen
+- with up bcond
+
 Revision 1.13  2007/02/13 08:06:37  glen
 - tabs in preamble
 

================================================================
Index: SPECS/kernel-char-frandom.spec
diff -u SPECS/kernel-char-frandom.spec:1.9 SPECS/kernel-char-frandom.spec:1.10
--- SPECS/kernel-char-frandom.spec:1.9	Tue Feb 13 09:06:37 2007
+++ SPECS/kernel-char-frandom.spec	Sat Mar 17 12:51:10 2007
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-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)
 #
@@ -118,10 +119,12 @@
 %postun	-n kernel%{_alt_kernel}-smp-char-frandom
 %depmod %{_kernel_ver}smp
 
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-char-frandom
 %defattr(644,root,root,755)
 %doc README CHANGELOG
 /lib/modules/%{_kernel_ver}/char/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-char-frandom
@@ -136,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/03/17 11:51:10  glen
+- with up bcond
+
 Revision 1.9  2007/02/13 08:06:37  glen
 - tabs in preamble
 

================================================================
Index: SPECS/kernel-cluster-cman.spec
diff -u SPECS/kernel-cluster-cman.spec:1.17 SPECS/kernel-cluster-cman.spec:1.18
--- SPECS/kernel-cluster-cman.spec:1.17	Tue Feb 13 09:06:37 2007
+++ SPECS/kernel-cluster-cman.spec	Sat Mar 17 12:51:10 2007
@@ -3,7 +3,8 @@
 # Condtional build:
 %bcond_without	kernel		# don't build kernel modules
 %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_with	verbose		# verbose build (V=1)
 #
 %define _rel	0.3
@@ -172,9 +173,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/cluster/cman.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-cluster-cman
@@ -193,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2007/03/17 11:51:10  glen
+- with up bcond
+
 Revision 1.17  2007/02/13 08:06:37  glen
 - tabs in preamble
 

================================================================
Index: SPECS/pwc.spec
diff -u SPECS/pwc.spec:1.20 SPECS/pwc.spec:1.21
--- SPECS/pwc.spec:1.20	Tue Feb 13 09:06:42 2007
+++ SPECS/pwc.spec	Sat Mar 17 12:51:10 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 package
 %bcond_with	verbose		# verbose build (V=1)
@@ -148,10 +149,12 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-video-pwc
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/usb/media/pwc-%{_module_suffix}.ko*
 %{_sysconfdir}/modprobe.d/%{_kernel_ver}/%{name}.conf
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-video-pwc
@@ -172,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/03/17 11:51:10  glen
+- with up bcond
+
 Revision 1.20  2007/02/13 08:06:42  glen
 - tabs in preamble
 

================================================================
Index: SPECS/pwcx.spec
diff -u SPECS/pwcx.spec:1.16 SPECS/pwcx.spec:1.17
--- SPECS/pwcx.spec:1.16	Tue Feb 13 09:06:42 2007
+++ SPECS/pwcx.spec	Sat Mar 17 12:51:10 2007
@@ -6,6 +6,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)
@@ -187,9 +188,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-video-pwcx
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/drivers/usb/media/pwcx.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-video-pwcx
@@ -211,6 +214,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2007/03/17 11:51:10  glen
+- with up bcond
+
 Revision 1.16  2007/02/13 08:06:42  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-block-gnbd.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/kernel-char-frandom.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/kernel-cluster-cman.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/pwc.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/pwcx.spec?r1=1.16&r2=1.17&f=u

