SPECS: madwifi.spec - new way of modules build, snap 20060128

[kiesiu]

Witam!

Proszę kogoś władnego o nałożenie patcha na spec w CVS i jeśli można STBR.
Buduje się i działa na i686.

madwifi.spec:
- new way of modules build
- snap 20060128

-- 
pozdrawiam,
Łukasz Kieś
-------------- next part --------------
--- madwifi.spec.orig	2006-03-04 22:56:06.000000000 +0100
+++ madwifi.spec	2006-03-15 15:19:38.000000000 +0100
@@ -10,26 +10,23 @@
 %bcond_with	verbose		# verbose build (V=1)
 
 #
+%define		snap	20060128
+%define		_rel	0.%{snap}.1
+%define		trunk	r1417
 Summary:	Atheros WiFi card driver
 Summary(pl):	Sterownik karty radiowej Atheros
 Name:		madwifi
 Version:	0
-%define		snap_year	2005
-%define		snap_month	11
-%define		snap_day	25
-%define		snap	%{snap_year}%{snap_month}%{snap_day}
-%define		snapdate	%{snap_year}-%{snap_month}-%{snap_day}
-%define		_rel	0.%{snap}.2
 Release:	%{_rel}
 Epoch:		0
 License:	GPL/BSD (partial source)
 Group:		Base/Kernel
-Source0:	http://madwifi.otaku42.de/%{snap_year}/%{snap_month}/%{name}-cvs-snapshot-%{snapdate}.tar.bz2
-# Source0-md5:	edb2791b3c1df2cd5db57d6a52670d62
-URL:		http://madwifi.sf.net/
+Source0:	http://snapshots.madwifi.org/madwifi-old/%{name}-old-%{trunk}-%{snap}.tar.gz
+# Source0-md5:	95d457e0edfb7028e09dee60db7fa7b8
+URL:		http://www.madwifi.org/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.153
+%{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.14}
+BuildRequires:	rpmbuild(macros) >= 1.286
 BuildRequires:	sharutils
 %endif
 ExclusiveArch:	%{x8664} arm %{ix86} mips ppc xscale
@@ -97,7 +94,7 @@
 Ten pakiet zawiera moduł jądra Linuksa SMP.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-old-%{trunk}-%{snap}
 
 %build
 %if %{with userspace}
@@ -114,35 +111,35 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include/{linux,config,asm}
-	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 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
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+%if %{with dist_kernel}
+	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
 %else
-        ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
+	install -d o/include/config
+	touch o/include/config/MARKER
+	ln -sf %{_kernelsrcdir}/scripts o/scripts
 %endif
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-	touch include/config/MARKER
+	ln -sf $PWD/Makefile.inc o/Makefile.inc
 #
 #	patching/creating makefile(s) (optional)
 #
 	%{__make} -C %{_kernelsrcdir} clean \
 		KERNELCONF="%{_kernelsrcdir}/config-$cfg" \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		M=$PWD O=$PWD/o \
 		KERNELPATH="%{_kernelsrcdir}" \
 		%{?with_verbose:V=1}
 	%{__make} \
+%ifarch %{x8664} %{ix86}
 		TARGET="%{_target_base_arch}-elf" \
+%endif
 		KERNELPATH=%{_kernelsrcdir} \
 		KERNELCONF="%{_kernelsrcdir}/config-$cfg" \
 		TOOLPREFIX= \
-		O=$PWD \
+		O=$PWD/o \
 		CC="%{__cc}" CPP="%{__cpp}" \
 		%{?with_verbose:V=1}