SPECS: bcm5700.spec - rel 4; fix ppc/spac

[arekm]

Author: arekm                        Date: Thu Jan 12 20:14:28 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4; fix ppc/spac

---- Files affected:
SPECS:
   bcm5700.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SPECS/bcm5700.spec
diff -u SPECS/bcm5700.spec:1.47 SPECS/bcm5700.spec:1.48
--- SPECS/bcm5700.spec:1.47	Sun Nov 13 03:15:15 2005
+++ SPECS/bcm5700.spec	Thu Jan 12 21:14:22 2006
@@ -11,11 +11,15 @@
 %undefine	with_dist_kernel
 %endif
 
+%ifarch sparc
+%undefine	with_smp
+%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:	8.2.18
-%define		_rel	3
+%define		_rel	4
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
@@ -27,17 +31,9 @@
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.153
-%ifarch sparc
-BuildRequires:  crosssparc64-gcc
-%endif
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch sparc
-%define         _target_base_arch       sparc64
-%define         _target_base_cpu             sparc64
-%endif
-
 %description
 This package contains the Linux driver for the Broadcom's NetXtreme BCM57xx Network Interface Cards.
 
@@ -93,16 +89,12 @@
 	install -d include/{linux,config}
 	ln -sf %{_kernelsrcdir}/config-$cfg .config
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-%ifarch ppc
-	if [ -d "%{_kernelsrcdir}/include/asm-powerpc" ]; then
-		install -d include/asm
-		cp -a %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
-		cp -a %{_kernelsrcdir}/include/asm-powerpc/* include/asm
-	else
-		ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	fi
+%ifarch ppc ppc64
+        install -d include/asm
+        [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -sf %{_kernelsrcdir}/include/asm-powerpc/* include/asm
+        [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* include/asm
 %else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
 %endif
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
 	touch include/config/MARKER
@@ -187,6 +179,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2006/01/12 20:14:22  arekm
+- rel 4; fix ppc/spac
+
 Revision 1.47  2005/11/13 02:15:15  sparky
 - if there is no asm-powerpc link asm-ppc !
 - spaces->tabs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bcm5700.spec?r1=1.47&r2=1.48&f=u