SPECS: bcm43xx.spec - use new kernel macros - remove smp stuff

[shadzik]

Author: shadzik                      Date: Sun Mar 25 22:57:10 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new kernel macros
- remove smp stuff

---- Files affected:
SPECS:
   bcm43xx.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/bcm43xx.spec
diff -u SPECS/bcm43xx.spec:1.20 SPECS/bcm43xx.spec:1.21
--- SPECS/bcm43xx.spec:1.20	Tue Feb 27 12:46:57 2007
+++ SPECS/bcm43xx.spec	Mon Mar 26 00:57:02 2007
@@ -3,15 +3,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
@@ -30,7 +24,7 @@
 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
@@ -51,8 +45,8 @@
 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
@@ -63,25 +57,6 @@
 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
@@ -139,12 +114,6 @@
 %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)
@@ -153,25 +122,21 @@
 %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
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/03/25 22:57:02  shadzik
+- use new kernel macros
+- remove smp stuff
+
 Revision 1.20  2007/02/27 11:46:57  sparky
 - without up bcond
 - fixed %files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bcm43xx.spec?r1=1.20&r2=1.21&f=u