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

sparky sparky at pld-linux.org
Tue Feb 27 12:13:34 CET 2007


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

---- Files affected:
SPECS:
   zaptel.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.77 SPECS/zaptel.spec:1.78
--- SPECS/zaptel.spec:1.77	Mon Feb 12 23:09:26 2007
+++ SPECS/zaptel.spec	Tue Feb 27 12:13:28 2007
@@ -3,6 +3,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
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
@@ -211,11 +212,13 @@
 %endif
 
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
+%endif
 
-%if %{with smp}
+%if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/misc/*.ko*
@@ -228,6 +231,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2007/02/27 11:13:28  sparky
+- --without up bcond
+- fixed %files
+
 Revision 1.77  2007/02/12 22:09:26  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zaptel.spec?r1=1.77&r2=1.78&f=u



More information about the pld-cvs-commit mailing list