SPECS: acx100.spec - rel 3

[arekm]

Author: arekm                        Date: Thu Jan 12 19:54:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3

---- Files affected:
SPECS:
   acx100.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/acx100.spec
diff -u SPECS/acx100.spec:1.45 SPECS/acx100.spec:1.46
--- SPECS/acx100.spec:1.45	Sun Nov 13 03:20:02 2005
+++ SPECS/acx100.spec	Thu Jan 12 20:54:18 2006
@@ -1,17 +1,20 @@
 # $Revision$, $Date$
+# TODO:
+# - add firmware download?
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	smp		# don't build SMP module
 #
-# TODO:
-# - add firmware download?
+%ifarch sparc
+%undefine	with_smp
+%endif
 #
 Summary:	Linux driver for WLAN card base on ACX100
 Summary(pl):	Sterownik dla Linuksa do kart bezprzewodowych na układzie ACX100
 Name:		acx100
 Version:	0.2.0pre8_plus_fixes_57
-%define	_rel	1
+%define	_rel	3
 Release:	%{_rel}
 License:	MPL or GPL
 Group:		Base/Kernel
@@ -21,16 +24,8 @@
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.3}
 BuildRequires:	%{kgcc_package}
 BuildRequires:	rpmbuild(macros) >= 1.118
-%ifarch sparc
-BuildRequires:	crosssparc64-gcc
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch sparc
-%define		_target_base_arch	sparc64
-%define		_target_base_cpu	sparc64
-%endif
-
 %description
 This is driver for WLAN card based on ACX100 for Linux.
 
@@ -88,16 +83,12 @@
 	chmod 700 modules
 	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
@@ -167,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2006/01/12 19:54:18  arekm
+- rel 3
+
 Revision 1.45  2005/11/13 02:20:02  sparky
 - if there is no asm-powerpc link asm-ppc !
 - spaces->tabs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/acx100.spec?r1=1.45&r2=1.46&f=u