SPECS (AC-branch): zaptel.spec - without up bcond, rel. 2

[dzeus]

Author: dzeus                        Date: Fri Mar  9 09:30:58 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- without up bcond, rel. 2

---- Files affected:
SPECS:
   zaptel.spec (1.75.2.2 -> 1.75.2.3) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.75.2.2 SPECS/zaptel.spec:1.75.2.3
--- SPECS/zaptel.spec:1.75.2.2	Thu Mar  8 13:11:54 2007
+++ SPECS/zaptel.spec	Fri Mar  9 10:30:50 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
@@ -15,7 +16,7 @@
 %undefine	with_smp
 %endif
 #
-%define		_rel	1
+%define		_rel	2
 Summary:	Zaptel telephony device support
 Summary(pl):	Obsługa urządzeń telefonicznych Zaptel
 Name:		zaptel
@@ -177,7 +178,6 @@
 %postun -n kernel%{_alt_kernel}-smp-%{name}
 %depmod %{_kernel_ver}smp
 
-%if %{with userspace}
 %post init
 /sbin/chkconfig --add %{name}
 %service %{name} restart
@@ -213,11 +213,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*
@@ -230,6 +232,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.75.2.3  2007/03/09 09:30:50  dzeus
+- without up bcond, rel. 2
+
 Revision 1.75.2.2  2007/03/08 12:11:54  dzeus
 - updated to 1.2.15
 - updated modules and patches
================================================================

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