From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 29 Sep 2008 20:47:14 +0000 (+0000)
Subject: - merge changes from LINUX_2_6_22 branch; rel 6
X-Git-Tag: auto/ac/bcm5700-8_3_14-6
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=refs%2Fheads%2FLINUX_2_6_16;hp=987a603c1d5d21d716762675cd2814a6784e62a9;p=packages%2Fbcm5700.git

- 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 3be6ea8..0c1bbab 100644
--- 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