- merge changes from LINUX_2_6_22 branch; rel 6

Changed files:
    bcm5700.spec -> 1.55.2.9.2.1

diff --git a/bcm5700.spec b/bcm5700.spec
index 3be6ea8970881977c13009a3d236a2090bd24d81..0c1bbabf7ed419db4ea5a47587255a0583560922 100644 (file)
--- a/bcm5700.spec
+++ b/bcm5700.spec
@@ -13,17 +13,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
@@ -32,7 +37,7 @@ Source0:      %{pname}-%{version}.tar.gz
 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
@@ -50,9 +55,10 @@ Uwaga: ten sterownik Broadcomu jest przestarzały, należy używać tg3.
 %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
@@ -68,9 +74,10 @@ Uwaga: ten sterownik Broadcomu jest przestarzały, należy używać tg3.
 %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