SPECS: rt2500.spec - %{_alt_kernel} support - use %build_kernel_mo...

[sparky]

Author: sparky                       Date: Mon Nov 13 17:29:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules macros

---- Files affected:
SPECS:
   rt2500.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/rt2500.spec
diff -u SPECS/rt2500.spec:1.21 SPECS/rt2500.spec:1.22
--- SPECS/rt2500.spec:1.21	Wed Sep  6 15:48:33 2006
+++ SPECS/rt2500.spec	Mon Nov 13 18:29:06 2006
@@ -26,8 +26,8 @@
 Patch0:		%{name}-qt.patch
 URL:		http://rt2x00.serialmonkey.com/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.217
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+BuildRequires:	rpmbuild(macros) >= 1.329
 %endif
 %if %{with userspace}
 BuildRequires:	pkgconfig
@@ -43,7 +43,7 @@
 Program do konfiguracji kart bezprzewodowych opartych na układzie
 RT2500.
 
-%package -n kernel-net-rt2500
+%package -n kernel%{_alt_kernel}-net-rt2500
 Summary:	Linux driver for WLAN cards based on RT2500
 Summary(pl):	Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie RT2500
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -54,18 +54,18 @@
 Requires(postun):	%releq_kernel_up
 %endif
 
-%description -n kernel-net-rt2500
+%description -n kernel%{_alt_kernel}-net-rt2500
 This is a Linux driver for WLAN cards based on RT2500.
 
 This package contains Linux module.
 
-%description -n kernel-net-rt2500 -l pl
+%description -n kernel%{_alt_kernel}-net-rt2500 -l pl
 Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie
 RT2500.
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel-smp-net-rt2500
+%package -n kernel%{_alt_kernel}-smp-net-rt2500
 Summary:	Linux SMP driver for WLAN cards based on RT2500
 Summary(pl):	Sterownik dla Linuksa SMP do kart bezprzewodowych opartych na układzie RT2500
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -76,12 +76,12 @@
 Requires(postun):	%releq_kernel_smp
 %endif
 
-%description -n kernel-smp-net-rt2500
+%description -n kernel%{_alt_kernel}-smp-net-rt2500
 This is a Linux driver for WLAN cards based on RT2500.
 
 This package contains Linux SMP module.
 
-%description -n kernel-smp-net-rt2500 -l pl
+%description -n kernel%{_alt_kernel}-smp-net-rt2500 -l pl
 Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie
 RT2500.
 
@@ -103,30 +103,7 @@
 %endif
 
 %if %{with kernel}
-# kernel module(s)
-cd Module
-
-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 \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	mv rt2500{,-$cfg}.ko
-done
-
+%build_kernel_modules -C Module -m rt2500
 %endif
 
 %install
@@ -137,30 +114,22 @@
 %endif
 
 %if %{with kernel}
-cd Module
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net/wireless
-install rt2500-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/rt2500.ko
-%if %{with smp} && %{with dist_kernel}
-install rt2500-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/rt2500.ko
-%endif
-cd -
+%install_kernel_modules -m Module/rt2500 -d kernel/drivers/net/wireless
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-net-rt2500
+%post -n kernel%{_alt_kernel}-net-rt2500
 %depmod %{_kernel_ver}
 
-%postun -n kernel-net-rt2500
+%postun -n kernel%{_alt_kernel}-net-rt2500
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-net-rt2500
+%post -n kernel%{_alt_kernel}-smp-net-rt2500
 %depmod %{_kernel_ver}smp
 
-%postun -n kernel-smp-net-rt2500
+%postun -n kernel%{_alt_kernel}-smp-net-rt2500
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
@@ -171,12 +140,12 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel-net-rt2500
+%files -n kernel%{_alt_kernel}-net-rt2500
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/*.ko*
 
 %if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-rt2500
+%files -n kernel%{_alt_kernel}-smp-net-rt2500
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless/*.ko*
 %endif
@@ -188,6 +157,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/11/13 17:29:06  sparky
+- %{_alt_kernel} support
+- use %build_kernel_modules, %install_kernel_modules macros
+
 Revision 1.21  2006/09/06 13:48:33  sparky
 - mass atack: -j1 for make scripts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rt2500.spec?r1=1.21&r2=1.22&f=u