SPECS (LINUX_2_6_16): bcm5700.spec - merge changes from LINUX_2_6_22 branch...

[glen]

Author: glen                         Date: Mon Sep 29 20:47:20 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- merge changes from LINUX_2_6_22 branch; rel 6

---- Files affected:
SPECS:
   bcm5700.spec (1.55.2.9 -> 1.55.2.9.2.1) 

---- Diffs:

================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.55.2.9 SPECS/bcm5700.spec:1.55.2.9.2.1
--- SPECS/bcm5700.spec:1.55.2.9	Fri Feb 15 16:18:56 2008
+++ SPECS/bcm5700.spec	Mon Sep 29 22:47:14 2008
@@ -14,17 +14,22 @@
 %if "%{_alt_kernel}" != "%{nil}"
 %undefine	with_userspace
 %endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
+%endif
 
 %ifarch sparc
 %undefine	with_smp
 %endif
 
+%define		rel		6
 %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:		%{pname}%{_alt_kernel}
 Version:	8.3.14
-Release:	3
+Release:	%{rel}
 License:	GPL v2
 Group:		Base/Kernel
 # extracted from http://www.broadcom.com/docs/driver_download/570x/linux-8.3.14.zip
@@ -33,7 +38,7 @@
 Source1:	%{pname}-Makefile
 URL:		http://www.broadcom.com/drivers/downloaddrivers.php
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
-BuildRequires:	rpmbuild(macros) >= 1.379
+BuildRequires:	rpmbuild(macros) >= 1.452
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,9 +56,10 @@
 %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_vermagic}
 Group:		Base/Kernel
-%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-net-bcm5700
 Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface
@@ -69,9 +75,10 @@
 %package -n kernel%{_alt_kernel}-smp-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_vermagic}
 Group:		Base/Kernel
-%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
 Requires(post,postun):	/sbin/depmod
+%{?with_dist_kernel:Requires:	kernel%{_alt_kernel}-smp(vermagic) = %{_kernel_ver}}
 
 %description -n kernel%{_alt_kernel}-smp-net-bcm5700
 Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network
@@ -152,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55.2.9.2.1  2008/09/29 20:47:14  glen
+- merge changes from LINUX_2_6_22 branch; rel 6
+
 Revision 1.55.2.9  2008/02/15 15:18:56  glen
 - release 3
 
================================================================

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