SPECS: submount.spec - rel 3; fix ppc/sparc

[arekm]

Author: arekm                        Date: Thu Jan 12 20:35:08 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; fix ppc/sparc

---- Files affected:
SPECS:
   submount.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/submount.spec
diff -u SPECS/submount.spec:1.9 SPECS/submount.spec:1.10
--- SPECS/submount.spec:1.9	Sun Nov 13 03:20:02 2005
+++ SPECS/submount.spec	Thu Jan 12 21:35:03 2006
@@ -7,11 +7,15 @@
 %bcond_without	userspace	# don't build userspace utilities
 %bcond_with	verbose		# verbose build (V=1)
 #
+%ifarch sparc
+%undefine	with_smp
+%endif
+#
 Summary:	Automatically mounts and unmounts removable media devices
 Summary(pl):	Automatyczne montowanie i odmontowywanie wymiennych nośników danych
 Name:		submount
 Version:	0.9
-%define		_rel	2
+%define		_rel	3
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
@@ -22,16 +26,8 @@
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.217
 %endif
-%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
 Submount is a system for automatically mounting and unmounting
 removable media drives like cdroms and floppy disk drives. It works
@@ -102,16 +98,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
 %if %{without dist_kernel}
@@ -205,6 +197,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/01/12 20:35:03  arekm
+- rel 3; fix ppc/sparc
+
 Revision 1.9  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/submount.spec?r1=1.9&r2=1.10&f=u