SPECS: bcm4400.spec - removed up, smp bconds, smp subpackage; patc...

[zbyniu]

Author: zbyniu                       Date: Sun Sep  9 23:43:07 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed up, smp bconds, smp subpackage; patch utsrelease added

---- Files affected:
SPECS:
   bcm4400.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/bcm4400.spec
diff -u SPECS/bcm4400.spec:1.28 SPECS/bcm4400.spec:1.29
--- SPECS/bcm4400.spec:1.28	Tue Feb 27 12:21:39 2007
+++ SPECS/bcm4400.spec	Mon Sep 10 01:43:01 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		_rel	2
 Summary:	Broadcom BCM4400 series driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Broadcom BCM4400
@@ -24,10 +18,11 @@
 # Source0-md5:	3539dc7a212a8f0dbdfeef40c7c4e027
 Source1:	%{name}-Makefile
 Patch0:		%{name}-fix-unknown_symbol.patch
+Patch1:		%{name}-utsrelease.patch
 URL:		http://www.broadcom.com/drivers/downloaddrivers.php
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.330
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 BuildRequires:	unzip
 Requires(post,postun):	/sbin/depmod
@@ -50,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
 Provides:	kernel-net(bcm4400)
 
@@ -63,30 +58,11 @@
 Pakiet zawiera sterownik dla Linuksa do kart sieciowych Broadcom
 BCM4400 10/100Mbit.
 
-%package -n kernel%{_alt_kernel}-smp-net-bcm4400
-Summary:	Broadcom BCM4400 driver for Linux SMP
-Summary(pl.UTF-8):	Sterownik do karty Broadcom BCM4400 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
-Provides:	kernel-net(bcm4400)
-
-%description -n kernel%{_alt_kernel}-smp-net-bcm4400
-This package contains the Linux SMP driver for the Broadcom BCM4400
-series 10/100 Mbps Ethernet Network Cdapter.
-
-%description -n kernel%{_alt_kernel}-smp-net-bcm4400 -l pl.UTF-8
-Pakiet zawiera sterownik dla Linuksa SMP do kart sieciowych Broadcom
-BCM4400 10/100Mbit.
-
 %prep
 %setup -q -c
 %{__tar} zxf %{name}-%{version}.tar.gz
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd %{name}-%{version}/src
@@ -118,12 +94,6 @@
 %postun	-n kernel%{_alt_kernel}-net-bcm4400
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-bcm4400
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-net-bcm4400
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -132,25 +102,20 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-bcm4400
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/bcm4400.ko*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-bcm4400
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/bcm4400.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.29  2007/09/09 23:43:01  zbyniu
+- removed up, smp bconds, smp subpackage; patch utsrelease added
+
 Revision 1.28  2007/02/27 11:21:39  sparky
 - without up bcond
 - fixed %files
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bcm4400.spec?r1=1.28&r2=1.29&f=u