SPECS: submount.spec - rel 2

[arekm]

Author: arekm                        Date: Sat Nov 12 11:06:49 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2

---- Files affected:
SPECS:
   submount.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/submount.spec
diff -u SPECS/submount.spec:1.7 SPECS/submount.spec:1.8
--- SPECS/submount.spec:1.7	Thu Sep 22 20:22:31 2005
+++ SPECS/submount.spec	Sat Nov 12 12:06:43 2005
@@ -11,7 +11,7 @@
 Summary(pl):	Automatyczne montowanie i odmontowywanie wymiennych nośników danych
 Name:		submount
 Version:	0.9
-%define		_rel	1
+%define		_rel	2
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
@@ -22,8 +22,16 @@
 %{?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
@@ -94,7 +102,17 @@
 	install -d include/{linux,config}
 	ln -sf %{_kernelsrcdir}/config-$cfg .config
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%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-powerpc include/asm
+        fi
+%else
+        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+%endif
 	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
 %if %{without dist_kernel}
 	ln -sf %{_kernelsrcdir}/scripts
@@ -105,6 +123,11 @@
 		M=$PWD O=$PWD \
 		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
+%if "%{_target_base_arch}" != "%{_arch}"
+		ARCH=%{_target_base_arch} \
+		CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
+%endif
+		HOSTCC="%{__cc}" \
 		M=$PWD O=$PWD \
 		%{?with_verbose:V=1}
 	mv subfs.ko subfs-$cfg.ko
@@ -182,6 +205,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/11/12 11:06:43  arekm
+- rel 2
+
 Revision 1.7  2005/09/22 18:22:31  pluto
 - docs added, typo fixed, adapterized.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/submount.spec?r1=1.7&r2=1.8&f=u