SPECS (firegl-8_28): X11-driver-firegl.spec - merged build_kernel_...

[glen]

Author: glen                         Date: Wed Dec  6 16:27:34 2006 GMT
Module: SPECS                         Tag: firegl-8_28
---- Log message:
- merged build_kernel_modules, %install_kernel_modules changes from HEAD

---- Files affected:
SPECS:
   X11-driver-firegl.spec (1.130.2.1 -> 1.130.2.2) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.130.2.1 SPECS/X11-driver-firegl.spec:1.130.2.2
--- SPECS/X11-driver-firegl.spec:1.130.2.1	Wed Dec  6 17:24:26 2006
+++ SPECS/X11-driver-firegl.spec	Wed Dec  6 17:27:29 2006
@@ -44,7 +44,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.308
+BuildRequires:	rpmbuild(macros) >= 1.330
 Requires:	X11-OpenGL-core >= %{_min_eq_x11}
 Requires:	X11-Xserver
 %{?with_kernel:Requires:	X11-driver-firegl(kernel)}
@@ -61,6 +61,8 @@
 ExclusiveArch:	i586 i686 athlon pentium3 pentium4 %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_ccver	%(rpm -q --qf "%{VERSION}" gcc | sed 's/\\..*//')
+
 %define		_noautoreqdep	libGL.so.1
 
 %define		_prefix		/usr/X11R6
@@ -137,24 +139,7 @@
 %if %{with kernel}
 cd common/lib/modules/fglrx/build_mod
 cp -f 2.6.x/Makefile .
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-		exit 1
-	fi
-	install -d o/include/linux
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	mv fglrx{,-$cfg}.ko
-done
+%build_kernel_modules -m fglrx GCC_VER_MAJ=%{_ccver}
 cd -
 %endif
 
@@ -171,16 +156,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-cd common/lib/modules/fglrx/build_mod
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-
-install fglrx-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/fglrx.ko
-%if %{with smp} && %{with dist_kernel}
-install fglrx-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/fglrx.ko
-%endif
-cd -
+%install_kernel_modules -m common/lib/modules/fglrx/build_mod/fglrx -d misc
 %endif
 
 %if %{with userspace}
@@ -269,6 +245,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.130.2.2  2006/12/06 16:27:29  glen
+- merged build_kernel_modules, %install_kernel_modules changes from HEAD
+
 Revision 1.130.2.1  2006/12/06 16:24:26  glen
 - add -utsrelease.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11-driver-firegl.spec?r1=1.130.2.1&r2=1.130.2.2&f=u