SPECS: bcm43xx.spec - without up bcond - fixed %files

sparky sparky at pld-linux.org
Tue Feb 27 12:47:02 CET 2007


Author: sparky                       Date: Tue Feb 27 11:47:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- without up bcond
- fixed %files

---- Files affected:
SPECS:
   bcm43xx.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/bcm43xx.spec
diff -u SPECS/bcm43xx.spec:1.19 SPECS/bcm43xx.spec:1.20
--- SPECS/bcm43xx.spec:1.19	Mon Feb 12 22:23:48 2007
+++ SPECS/bcm43xx.spec	Tue Feb 27 12:46: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 module
 %bcond_with	verbose		# verbose build (V=1)
@@ -152,9 +153,11 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-bcm43xx
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm43xx.ko*
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-net-bcm43xx
@@ -169,6 +172,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2007/02/27 11:46:57  sparky
+- without up bcond
+- fixed %files
+
 Revision 1.19  2007/02/12 21:23:48  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bcm43xx.spec?r1=1.19&r2=1.20&f=u



More information about the pld-cvs-commit mailing list