SPECS: bcm5700.spec - alt_kernel stuff merge from AC-branch

[glen]

Author: glen                         Date: Fri Feb 15 14:37:26 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- alt_kernel stuff merge from AC-branch

---- Files affected:
SPECS:
   bcm5700.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.60 SPECS/bcm5700.spec:1.61
--- SPECS/bcm5700.spec:1.60	Fri Feb  8 19:45:35 2008
+++ SPECS/bcm5700.spec	Fri Feb 15 15:37:21 2008
@@ -6,14 +6,18 @@
 %bcond_without	userspace	# don't build userspace programs
 %bcond_with	verbose		# verbose build (V=1)
 
-%if !%{with kernel}
+%if %{without kernel}
 %undefine	with_dist_kernel
 %endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
+%endif
 
 %define		_rel	1
+%define		pname	bcm5700
 Summary:	Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart sieciowych Broadcom NetXtreme BCM57xx
-Name:		bcm5700
+Name:		%{pname}%{_alt_kernel}
 Version:	8.3.14
 Release:	%{_rel}
 License:	GPL v2
@@ -24,10 +28,8 @@
 Source1:	%{name}-Makefile
 Patch0:		%{name}-2.6.22.patch
 URL:		http://www.broadcom.com/drivers/downloaddrivers.php
-%if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.20.2}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +44,7 @@
 
 Uwaga: ten sterownik Broadcomu jest przestarzały, należy używać tg3.
 
-%package -n kernel-net-bcm5700
+%package -n kernel%{_alt_kernel}-net-bcm5700
 Summary:	Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards
 Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -53,13 +55,13 @@
 Requires(postun):	%releq_kernel
 %endif
 
-%description -n kernel-net-bcm5700
+%description -n kernel%{_alt_kernel}-net-bcm5700
 Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface
 Cards.
 
 Note: this driver is obsoleted by Broadcom, use tg3 instead.
 
-%description -n kernel-net-bcm5700 -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-net-bcm5700 -l pl.UTF-8
 Sterownik dla Linuksa do kart sieciowych Broadcom BCM57xx.
 
 Uwaga: ten sterownik Broadcomu jest przestarzały, należy używać tg3.
@@ -87,12 +89,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-n kernel-net-bcm5700
+%post	-n kernel%{_alt_kernel}-net-bcm5700
 %depmod %{_kernel_ver}
 
-%postun	-n kernel-net-bcm5700
+%postun	-n kernel%{_alt_kernel}-net-bcm5700
 %depmod %{_kernel_ver}
 
+%post	-n kernel%{_alt_kernel}-smp-net-bcm5700
+%depmod %{_kernel_ver}smp
+
+%postun	-n kernel%{_alt_kernel}-smp-net-bcm5700
+%depmod %{_kernel_ver}smp
+
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -101,7 +109,7 @@
 %endif
 
 %if %{with kernel}
-%files -n kernel-net-bcm5700
+%files -n kernel%{_alt_kernel}-net-bcm5700
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm5700.ko*
 %endif
@@ -112,6 +120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2008-02-15 14:37:21  glen
+- alt_kernel stuff merge from AC-branch
+
 Revision 1.60  2008-02-08 18:45:35  qboosh
 - unified note
 
@@ -193,7 +204,7 @@
 - rel 1
 
 Revision 1.35  2004/08/06 12:13:35  pluto
-- main pkg. without %%{_kernel_ver_str}.
+- main pkg. without %{_kernel_ver_str}.
 
 Revision 1.34  2004/08/06 12:05:43  pluto
 - md5.
@@ -222,7 +233,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.26  2003/05/16 08:33:42  trojan
-- fixed depmod in %%post and %%postun when build with _without_dist_kernel
+- fixed depmod in %post and %postun when build with _without_dist_kernel
 
 Revision 1.25  2003/05/14 14:42:43  qboosh
 - added depmod options so modules can be installed for kernel other than running
@@ -238,10 +249,10 @@
 
 Revision 1.21  2003/03/03 20:57:19  marcus
 - updated to version 2.2.19 (from Compaq SoftPack)
-(Ra - updates/general STBR)
+  (Ra - updates/general STBR)
 
 Revision 1.20  2002/11/27 21:10:39  juandon
-- new %%doc
+- new %doc
 
 Revision 1.19  2002/11/17 18:31:50  kloczek
 - release 11: rebuild against kernel 2.2.22-6.
@@ -275,7 +286,7 @@
 - use kgcc_package macro
 
 Revision 1.10  2002/02/26 15:11:06  qboosh
-- use %%kgcc macro
+- use %kgcc macro
 
 Revision 1.9  2002/02/26 13:22:24  qboosh
 - use requires_releq_kernel_{up,smp} macros, BR: egcs, release 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bcm5700.spec?r1=1.60&r2=1.61&f=u