SPECS: rt2500.spec - rel .3

arekm arekm at pld-linux.org
Thu Jan 12 21:24:23 CET 2006


Author: arekm                        Date: Thu Jan 12 20:24:23 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel .3

---- Files affected:
SPECS:
   rt2500.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/rt2500.spec
diff -u SPECS/rt2500.spec:1.13 SPECS/rt2500.spec:1.14
--- SPECS/rt2500.spec:1.13	Sun Nov 13 03:20:02 2005
+++ SPECS/rt2500.spec	Thu Jan 12 21:24:14 2006
@@ -7,12 +7,16 @@
 %bcond_without	userspace	# don't build userspace tool
 %bcond_with	verbose		# verbose build (V=1)
 #
+%ifarch sparc
+%undefine	with_smp
+%endif
+#
 Summary:	Linux driver for WLAN cards based on RT2500
 Summary(pl):	Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie RT2500
 Name:		rt2500
 Version:	1.1.0
 %define		_subver	b3
-%define		_rel	0.%{_subver}.2
+%define		_rel	0.%{_subver}.3
 Release:	%{_rel}
 Group:		Base/Kernel
 License:	GPL v2
@@ -22,9 +26,6 @@
 Patch0:		%{name}-qt.patch
 URL:		http://rt2x00.serialmonkey.com/
 %if %{with kernel}
-%ifarch sparc
-BuildRequires:  crosssparc64-gcc
-%endif
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.217
 %endif
@@ -36,11 +37,6 @@
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch sparc
-%define         _target_base_arch	sparc64
-%define         _target_base_cpu	sparc64
-%endif
-
 %description
 A configuartion tool for WLAN cards based on RT2500.
 
@@ -117,16 +113,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
@@ -206,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/01/12 20:24:14  arekm
+- rel .3
+
 Revision 1.13  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/rt2500.spec?r1=1.13&r2=1.14&f=u



More information about the pld-cvs-commit mailing list