SPECS (AC-branch): X11-driver-firegl.spec - add desktop_kernel bco...

[glen]

Author: glen                         Date: Tue Nov  6 21:11:16 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- add desktop_kernel bcond to be able to build module for kernel-desktop.spec

---- Files affected:
SPECS:
   X11-driver-firegl.spec (1.141.2.17 -> 1.141.2.18) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.141.2.17 SPECS/X11-driver-firegl.spec:1.141.2.18
--- SPECS/X11-driver-firegl.spec:1.141.2.17	Tue Nov  6 19:28:31 2007
+++ SPECS/X11-driver-firegl.spec	Tue Nov  6 22:11:10 2007
@@ -9,10 +9,19 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_without	incall		# include all sources in srpm
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
+%bcond_with	desktop_kernel	# build for kernel-desktop (disables UP and SMP)
 
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%if %{with kernel} && %{with dist_kernel}
+%if %{with grsec_kernel}
 %define	alt_kernel	grsecurity
 %endif
+%if %{with desktop_kernel}
+%define	alt_kernel	desktop
+%define	requires_releq_kernel_up %requires_releq_kernel
+%undefine	with_up
+%undefine	with_smp
+%endif
+%endif
 %if %{without kernel}
 %undefine with_dist_kernel
 %endif
@@ -52,7 +61,7 @@
 #BuildRequires:	X11-devel >= %{_min_eq_x11}	# disabled for now
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
 %{?with_userspace:BuildRequires:	qt-devel}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.406
 Requires:	X11-OpenGL-core >= %{_min_eq_x11}
 Requires:	X11-Xserver
 %{?with_kernel:Requires:	X11-driver-firegl(kernel)}
@@ -239,7 +248,7 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
+%if %{with up} || %{without dist_kernel} || %{with desktop_kernel}
 %files -n kernel%{_alt_kernel}-video-firegl
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
@@ -258,6 +267,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.141.2.18  2007/11/06 21:11:10  glen
+- add desktop_kernel bcond to be able to build module for kernel-desktop.spec
+
 Revision 1.141.2.17  2007/11/06 18:28:31  glen
 - rel 57 (2.6.16.57-1)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-firegl.spec?r1=1.141.2.17&r2=1.141.2.18&f=u