- extra_cflags killed (kernel buildsystem provides suitable options).

[packages/bcm5700.git] / bcm5700.spec

diff --git a/bcm5700.spec b/bcm5700.spec
index b06232ae55409cfe17f52b507ed01c0c94b10daa..e7601ccb4fba7a0f356b4e478301925e6654027d 100644 (file)
--- a/bcm5700.spec
+++ b/bcm5700.spec
@@ -3,28 +3,30 @@
 %bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without kernel          # don't build kernel modules
 %bcond_without smp             # don't build SMP module
-%bcond_without userspace       # don't build userspace module
+%bcond_without userspace       # don't build userspace programs
 %bcond_with    verbose         # verbose build (V=1)
-#
+
+%if %{without kernel}
+%undefine      with_dist_kernel
+%endif
+
 Summary:       Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards
 Summary(pl):   Sterownik dla Linuksa do kart sieciowych Broadcom NetXtreme BCM57xx
 Name:          bcm5700
-Version:       7.3.5
+Version:       8.1.55
 %define                _rel    1
 Release:       %{_rel}
-License:       GPL
+License:       GPL v2
 Group:         Base/Kernel
-# extracted from http://www.broadcom.com/docs/driver_download/570x/linux-7.3.5.zip
+# extracted from http://www.broadcom.com/docs/driver_download/570x/linux-8.1.55.zip
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 28678cb977e24b27e40fdf27a5237a4d
+# Source0-md5: d2461bef17b3c97365a581f4fb12cf5b
 Source1:       %{name}-Makefile
 URL:           http://www.broadcom.com/drivers/downloaddrivers.php
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:     kernel-headers > 2.6.7}
+%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
 BuildRequires: rpmbuild(macros) >= 1.153
 %endif
-Requires(post,postun): /sbin/depmod
-Requires:      kernel-net(bcm5700)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,10 +40,11 @@ Summary:    Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network Interface
 Summary(pl):   Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx
 Release:       %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun): /sbin/depmod
-%{?with_dist_kernel:Requires(postun):  kernel}
-Provides:      kernel-net(bcm5700)
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):      %releq_kernel_up
+%endif
 
 %description -n kernel-net-bcm5700
 Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards.
@@ -54,10 +57,11 @@ Summary:    Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network Interface
 Summary(pl):   Sterownik dla Linuksa SMP do kart sieciowych Broadcom BCM57xx
 Release:       %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun): /sbin/depmod
-%{?with_dist_kernel:Requires(postun):  kernel-smp}
-Provides:      kernel-net(bcm5700)
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):      %releq_kernel_smp
+%endif
 
 %description -n kernel-smp-net-bcm5700
 Linux SMP driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards.
@@ -82,6 +86,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
        touch include/config/MARKER
+
        install %{SOURCE1} Makefile
 
        %{__make} -C %{_kernelsrcdir} clean \
@@ -89,11 +94,9 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
                M=$PWD O=$PWD \
                %{?with_verbose:V=1}
        %{__make} -C %{_kernelsrcdir} modules \
+               %{?debug:DBG=1} \
                CC="%{__cc}" CPP="%{__cpp}" \
                M=$PWD O=$PWD \
-%ifarch ppc
-               EXTRA_CFLAGS="-msoft-float" \
-%endif
                %{?with_verbose:V=1}
 
        mv bcm5700{,-$cfg}.ko
@@ -111,7 +114,6 @@ install bcm5700.4 $RPM_BUILD_ROOT%{_mandir}/man4
 
 %if %{with kernel}
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/net
-
 install bcm5700-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm5700.ko
 %if %{with smp} && %{with dist_kernel}