SPECS: kernel-net-rt61.spec - snap 2007032609, switch to new macro...

[radek]

Author: radek                        Date: Mon Mar 26 15:39:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- snap 2007032609, switch to new macros, remove previous bogus commit info

---- Files affected:
SPECS:
   kernel-net-rt61.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-rt61.spec
diff -u SPECS/kernel-net-rt61.spec:1.10 SPECS/kernel-net-rt61.spec:1.11
--- SPECS/kernel-net-rt61.spec:1.10	Mon Mar 26 17:00:05 2007
+++ SPECS/kernel-net-rt61.spec	Mon Mar 26 17:39:08 2007
@@ -3,10 +3,9 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 
-%define		_snap	2007031213
+%define		_snap	2007032609
 %define		_rel	1.%{_snap}.1
 Summary:	Ralink RT61 802.11abg WLAN Driver
 Summary(pl.UTF-8):	Sterownik WLAN 802.11abg dla urządzeń Ralink RT61
@@ -22,36 +21,20 @@
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
 BuildRequires:	rpmbuild(macros) >= 1.308
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 Requires:	%{name}-firmware
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define	modules	rt61
+
 %description
 Ralink RT61 802.11abg WLAN Driver.
 
 %description -l pl.UTF-8
 Sterownik WLAN 802.11abg dla urządzeń Ralink RT61.
 
-%package -n kernel-smp-net-rt61
-Summary:	Ralink RT61 802.11abg WLAN Driver (SMP)
-Summary(pl.UTF-8):	Sterownik WLAN 802.11abg dla urządzeń Ralink RT61 (SMP)
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
-Requires:	%{name}-firmware
-
-%description -n kernel-smp-net-rt61
-Ralink RT61 802.11abg WLAN Driver (SMP).
-
-%description -n kernel-smp-net-rt61 -l pl.UTF-8
-Sterownik WLAN 802.11abg dla urządzeń Ralink RT61 (SMP).
-
 %package firmware
 Summary:	Firmware for Ralink RT61 802.11abg WLAN cards
 Summary(pl.UTF-8):	Firmware dla kart WLAN 802.11abg Ralink RT61
@@ -71,36 +54,7 @@
 
 %build
 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
-%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
-	%{__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 \
-		%{?debug:EXTRA_CFLAGS='-DAGGREGATION_SUPPORT -DWMM_SUPPORT -DRT61_DBG'} \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	mv rt61{,-$cfg}.ko
-done
+%build_kernel_modules -m %{modules}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -108,13 +62,8 @@
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/Wireless/RT61STA
 install Module/*.bin Module/rt61sta.dat $RPM_BUILD_ROOT%{_sysconfdir}/Wireless/RT61STA
 
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/drivers/net/wireless
-install Module/rt61-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/drivers/net/wireless/rt61.ko
-%if %{with smp} && %{with dist_kernel}
-install Module/rt61-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/drivers/net/wireless/rt61.ko
-%endif
+cd Module
+%install_kernel_modules -m %{modules} -d kernel/drivers/net/wireless
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -125,21 +74,9 @@
 %postun	-n kernel-net-rt61
 %depmod %{_kernel_ver}
 
-%post	-n kernel-smp-net-rt61
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel-smp-net-rt61
-%depmod %{_kernel_ver}smp
-
 %files -n kernel-net-rt61
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/drivers/net/wireless/*.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-net-rt61
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/drivers/net/wireless/*.ko*
-%endif
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/wireless/*.ko*
 
 %files firmware
 %defattr(644,root,root,755)
@@ -155,8 +92,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.10  2007/03/26 15:00:05  radek
-- switch to autrijus-snapshot, _snap 20050110
+Revision 1.11  2007/03/26 15:39:08  radek
+- snap 2007032609, switch to new macros, remove previous bogus commit info
 
 Revision 1.9  2007/02/12 22:09:10  glen
 - tabs in preamble
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-rt61.spec?r1=1.10&r2=1.11&f=u