SPECS: ipw2200.spec - use %build_kernel_modules and %install_kerne...

[shadzik]

Author: shadzik                      Date: Wed Nov 15 04:12:21 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %build_kernel_modules and %install_kernel_modules macros, BR: rpmbuild(macros) >= 1.330

---- Files affected:
SPECS:
   ipw2200.spec (1.69 -> 1.70) 

---- Diffs:

================================================================
Index: SPECS/ipw2200.spec
diff -u SPECS/ipw2200.spec:1.69 SPECS/ipw2200.spec:1.70
--- SPECS/ipw2200.spec:1.69	Mon Oct 16 12:54:29 2006
+++ SPECS/ipw2200.spec	Wed Nov 15 05:12:15 2006
@@ -15,6 +15,7 @@
 %define		_rel	2
 %define		_ieeever	1.2.15
 %define		_fwver	3.0
+%define		_mod_suffix	current
 Summary:	Intel(R) PRO/Wireless 2200 Driver for Linux
 Summary(de):	Intel(R) PRO/Wireless 2200 Treiber für Linux
 Summary(pl):	Sterownik dla Linuksa do kart Intel(R) PRO/Wireless 2200
@@ -30,7 +31,7 @@
 URL:		http://ipw2200.sourceforge.net/
 BuildRequires:	ieee80211-devel >= %{_ieeever}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.308
+BuildRequires:	rpmbuild(macros) >= 1.330
 Requires:	ipw2200-firmware = %{_fwver}
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -104,58 +105,11 @@
 %patch1 -p1
 %endif
 
-%build
-# kernel module(s)
-rm -rf built
-mkdir -p built/{nondist,smp,up}
-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}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-%if %{with dist_kernel}
-	%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-	install -d o/include/config
-	touch o/include/config/MARKER
-	ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-	export IEEE80211_INC=%{_kernelsrcdir}/include
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	mv *.ko built/$cfg
-done
+%build_kernel_modules -m %{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc \
-	 $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}{,smp}
-
-cd built
-install %{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/ipw2200.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/ipw2200_current.ko
-echo "alias ipw2200 ipw2200_current" \
-	>> $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}/ipw2200.conf
-
-%if %{with smp} && %{with dist_kernel}
-install smp/ipw2200.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/ipw2200_current.ko
-echo "alias ipw2200 ipw2200_current" \
-	>> $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/ipw2200.conf
-%endif
+%install_kernel_modules -s %{_mod_suffix} -n %{name} -m %{name} -d misc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -190,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70  2006/11/15 04:12:15  shadzik
+- use %build_kernel_modules and %install_kernel_modules macros, BR: rpmbuild(macros) >= 1.330
+
 Revision 1.69  2006/10/16 10:54:29  mguevara
 - todo added
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ipw2200.spec?r1=1.69&r2=1.70&f=u