SPECS: dLAN.spec, dazuko.spec, drbd24.spec, eagle-usb24.spec, em83...

glen glen at pld-linux.org
Wed Mar 14 01:16:28 CET 2007


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

---- Files affected:
SPECS:
   dLAN.spec (1.11 -> 1.12) , dazuko.spec (1.22 -> 1.23) , drbd24.spec (1.11 -> 1.12) , eagle-usb24.spec (1.55 -> 1.56) , em8300.spec (1.51 -> 1.52) , enbd24.spec (1.6 -> 1.7) , linux-fusion.spec (1.11 -> 1.12) , linux-gpib.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/dLAN.spec
diff -u SPECS/dLAN.spec:1.11 SPECS/dLAN.spec:1.12
--- SPECS/dLAN.spec:1.11	Mon Feb 12 22:23:52 2007
+++ SPECS/dLAN.spec	Wed Mar 14 01:16:22 2007
@@ -3,6 +3,7 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without kernel from distribution
 %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)
@@ -153,9 +154,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-char-dLAN
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/devolo_usb.*o*
+%endif
 
 %if %{with smp}
 %files -n kernel-smp-char-dLAN
@@ -170,6 +173,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/03/14 00:16:22  glen
+- up bcond
+
 Revision 1.11  2007/02/12 21:23:52  glen
 - tabs in preamble
 

================================================================
Index: SPECS/dazuko.spec
diff -u SPECS/dazuko.spec:1.22 SPECS/dazuko.spec:1.23
--- SPECS/dazuko.spec:1.22	Mon Feb 12 22:23:52 2007
+++ SPECS/dazuko.spec	Wed Mar 14 01:16:22 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)
@@ -238,9 +239,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-dazuko
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-misc-dazuko
@@ -275,6 +278,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007/03/14 00:16:22  glen
+- up bcond
+
 Revision 1.22  2007/02/12 21:23:52  glen
 - tabs in preamble
 

================================================================
Index: SPECS/drbd24.spec
diff -u SPECS/drbd24.spec:1.11 SPECS/drbd24.spec:1.12
--- SPECS/drbd24.spec:1.11	Mon Feb 12 22:23:53 2007
+++ SPECS/drbd24.spec	Wed Mar 14 01:16:22 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)
@@ -195,10 +196,12 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel24-block-drbd
 %defattr(644,root,root,755)
 %doc ChangeLog README
 /lib/modules/%{_kernel_ver}/misc/*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel24-smp-block-drbd
@@ -214,6 +217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/03/14 00:16:22  glen
+- up bcond
+
 Revision 1.11  2007/02/12 21:23:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/eagle-usb24.spec
diff -u SPECS/eagle-usb24.spec:1.55 SPECS/eagle-usb24.spec:1.56
--- SPECS/eagle-usb24.spec:1.55	Mon Feb 12 22:23:54 2007
+++ SPECS/eagle-usb24.spec	Wed Mar 14 01:16:22 2007
@@ -6,6 +6,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
 #
@@ -187,9 +188,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel24-usb-eagle
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/usb/eagle-usb.o*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel24-smp-usb-eagle
@@ -204,6 +207,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2007/03/14 00:16:22  glen
+- up bcond
+
 Revision 1.55  2007/02/12 21:23:54  glen
 - tabs in preamble
 

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.51 SPECS/em8300.spec:1.52
--- SPECS/em8300.spec:1.51	Mon Feb 12 22:23:54 2007
+++ SPECS/em8300.spec	Wed Mar 14 01:16:22 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 tools
 %bcond_with	verbose		# verbose build (V=1)
@@ -257,9 +258,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-video-em8300
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/video/*.ko*
+%endif
 
 %if %{with dist_kernel} && %{with smp}
 %files -n kernel%{_alt_kernel}-smp-video-em8300
@@ -274,6 +277,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2007/03/14 00:16:22  glen
+- up bcond
+
 Revision 1.51  2007/02/12 21:23:54  glen
 - tabs in preamble
 

================================================================
Index: SPECS/enbd24.spec
diff -u SPECS/enbd24.spec:1.6 SPECS/enbd24.spec:1.7
--- SPECS/enbd24.spec:1.6	Mon Feb 12 22:23:54 2007
+++ SPECS/enbd24.spec	Wed Mar 14 01:16:22 2007
@@ -5,6 +5,7 @@
 #
 # Conditional build:
 %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
 #
@@ -141,9 +142,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel24-block-enbd
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.o*
+%endif
 
 %if %{with smp}
 %files -n kernel24-smp-block-enbd
@@ -158,6 +161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/03/14 00:16:22  glen
+- up bcond
+
 Revision 1.6  2007/02/12 21:23:54  glen
 - tabs in preamble
 

================================================================
Index: SPECS/linux-fusion.spec
diff -u SPECS/linux-fusion.spec:1.11 SPECS/linux-fusion.spec:1.12
--- SPECS/linux-fusion.spec:1.11	Sun Mar 11 12:08:42 2007
+++ SPECS/linux-fusion.spec	Wed Mar 14 01:16:22 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
 
@@ -160,9 +161,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-char-fusion
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/char/fusion.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-char-fusion
@@ -177,6 +180,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/03/14 00:16:22  glen
+- up bcond
+
 Revision 1.11  2007/03/11 11:08:42  qboosh
 - updated to 3.2.3
 

================================================================
Index: SPECS/linux-gpib.spec
diff -u SPECS/linux-gpib.spec:1.13 SPECS/linux-gpib.spec:1.14
--- SPECS/linux-gpib.spec:1.13	Tue Feb 13 07:46:52 2007
+++ SPECS/linux-gpib.spec	Wed Mar 14 01:16:22 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)
@@ -215,9 +216,11 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel-%{mod_name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-%{mod_name}
@@ -232,6 +235,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2007/03/14 00:16:22  glen
+- up bcond
+
 Revision 1.13  2007/02/13 06:46:52  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dLAN.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/dazuko.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/drbd24.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/eagle-usb24.spec?r1=1.55&r2=1.56&f=u
    http://cvs.pld-linux.org/SPECS/em8300.spec?r1=1.51&r2=1.52&f=u
    http://cvs.pld-linux.org/SPECS/enbd24.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/linux-fusion.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/linux-gpib.spec?r1=1.13&r2=1.14&f=u



More information about the pld-cvs-commit mailing list