- use new kernel macros

- remove smp stuff

Changed files:
    bcm43xx.spec -> 1.21

diff --git a/bcm43xx.spec b/bcm43xx.spec
index 2b922eea0256a609901668421e16c26c9412b7a3..461d9b7a2bf3c3d7eb2f180df7006a8706cffcee 100644 (file)
--- a/bcm43xx.spec
+++ b/bcm43xx.spec
@@ -2,15 +2,9 @@
 # Conditional build:
 %bcond_without dist_kernel     # allow non-distribution kernel
 %bcond_without kernel          # don't build kernel modules
-%bcond_without up              # don't build UP module
-%bcond_without smp             # don't build SMP module
 %bcond_without userspace       # don't build userspace module
 %bcond_with    verbose         # verbose build (V=1)
 #
-%ifarch sparc
-%undefine      with_smp
-%endif
-#
 %define        _snap   060618
 %define        _fwcutter_ver   005
 %define        _rel    3
@@ -29,7 +23,7 @@ Patch0:               %{name}-local_headers.patch
 URL:           http://bcm43xx.berlios.de/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.330
+BuildRequires: rpmbuild(macros) >= 1.379
 BuildRequires: softmac-devel
 %endif
 Requires(post,postun): /sbin/depmod
@@ -50,8 +44,8 @@ Release:      %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):      %releq_kernel_up
+%requires_releq_kernel
+Requires(postun):      %releq_kernel
 %endif
 
 %description -n kernel%{_alt_kernel}-net-bcm43xx
@@ -62,25 +56,6 @@ Ethernet network adapter.
 Pakiet zawiera sterownik dla Linuksa do kart sieciowych Broadcom
 BCM43xx.
 
-%package -n kernel%{_alt_kernel}-smp-net-bcm43xx
-Summary:       Broadcom BCM43xx driver for Linux SMP
-Summary(pl.UTF-8):     Sterownik do karty Broadcom BCM43xx dla Linuksa SMP
-Release:       %{_rel}@%{_kernel_ver_str}
-Group:         Base/Kernel
-Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):      %releq_kernel_smp
-%endif
-
-%description -n kernel%{_alt_kernel}-smp-net-bcm43xx
-This package contains the Linux SMP driver for the Broadcom BCM43xx
-series Ethernet Network Adapter.
-
-%description -n kernel%{_alt_kernel}-smp-net-bcm43xx -l pl.UTF-8
-Pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych Broadcom
-BCM43xx.
-
 %prep
 %setup -q -n %{name}-standalone-%{_snap} -a1
 %patch0 -p1
@@ -138,12 +113,6 @@ rm -rf $RPM_BUILD_ROOT
 %postun        -n kernel%{_alt_kernel}-net-bcm43xx
 %depmod %{_kernel_ver}
 
-%post  -n kernel%{_alt_kernel}-smp-net-bcm43xx
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-bcm43xx
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -152,15 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-bcm43xx
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm43xx.ko*
 %endif
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-bcm43xx
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/bcm43xx.ko*
-%endif
-%endif