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

[sparky]

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

---- Files affected:
SPECS:
   softmac.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/softmac.spec
diff -u SPECS/softmac.spec:1.20 SPECS/softmac.spec:1.21
--- SPECS/softmac.spec:1.20	Mon Feb 12 23:09:15 2007
+++ SPECS/softmac.spec	Tue Feb 27 12:45:54 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)
@@ -163,6 +164,7 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-softmac
 %defattr(644,root,root,755)
 %dir /lib/modules/%{_kernel_ver}/kernel/net/ieee80211-%{name}
@@ -170,6 +172,7 @@
 %dir /lib/modules/%{_kernel_ver}/kernel/net/ieee80211-%{name}/%{name}
 /lib/modules/%{_kernel_ver}/kernel/net/ieee80211-%{name}/%{name}/ieee80211softmac.ko*
 %{_sysconfdir}/modprobe.d/%{_kernel_ver}/%{name}.conf
+%endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-net-softmac
@@ -188,6 +191,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/02/27 11:45:54  sparky
+- without up bcond
+- fixed %files
+
 Revision 1.20  2007/02/12 22:09:15  glen
 - tabs in preamble
 
================================================================

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