SPECS (AC-branch): em8300.spec - rel 4

[glen]

Author: glen                         Date: Fri Mar 16 18:28:00 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rel 4

---- Files affected:
SPECS:
   em8300.spec (1.49 -> 1.49.2.1) 

---- Diffs:

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.49 SPECS/em8300.spec:1.49.2.1
--- SPECS/em8300.spec:1.49	Tue Jan 23 23:16:59 2007
+++ SPECS/em8300.spec	Fri Mar 16 19:27:55 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)
@@ -19,7 +20,7 @@
 %undefine	with_kernel
 %endif
 
-%if !%{with kernel}
+%if %{without kernel}
 %undefine	with_dist_kernel
 %endif
 
@@ -27,7 +28,7 @@
 Summary(pl):	Sterowniki dla DXR3 i H+
 Name:		em8300
 Version:	0.16.0
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/System
 Source0:	http://dl.sourceforge.net/dxr3/%{name}-%{version}.tar.gz
@@ -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.49.2.1  2007/03/16 18:27:55  glen
+- rel 4
+
 Revision 1.49  2007/01/23 22:16:59  hawk
 - release 3
 
@@ -348,7 +354,7 @@
 
 Revision 1.28  2004/09/30 18:22:50  cieciwa
 - beginig preoared for 2.6.8-1.
-NFY
+  NFY
 
 Revision 1.27  2004/09/19 13:31:08  adasi
 - arrrghhhh
@@ -407,13 +413,13 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.11  2003/05/16 08:33:42  trojan
-- fixed depmod in %%post and %%postun when build with _without_dist_kernel
+- fixed depmod in %post and %postun when build with _without_dist_kernel
 
 Revision 1.10  2003/05/14 14:42:43  qboosh
 - added depmod options so modules can be installed for kernel other than running
 
 Revision 1.9  2002/12/07 14:32:49  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.8  2002/11/25 14:13:02  ankry
 - massive attack: no need for 755 for *.la
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/em8300.spec?r1=1.49&r2=1.49.2.1&f=u