SPECS: klibc.spec - use linux-libc-headers

[qboosh]

Author: qboosh                       Date: Fri Sep  7 21:55:31 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use linux-libc-headers

---- Files affected:
SPECS:
   klibc.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: SPECS/klibc.spec
diff -u SPECS/klibc.spec:1.65 SPECS/klibc.spec:1.66
--- SPECS/klibc.spec:1.65	Fri Sep  7 15:57:30 2007
+++ SPECS/klibc.spec	Fri Sep  7 23:55:26 2007
@@ -12,13 +12,12 @@
 Group:		Libraries
 Source0:	http://www.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
 # Source0-md5:	481dfdef7273f2cc776c2637f481f017
-#Source0:	http://www.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-klcc.patch
 Patch1:		%{name}-kill_interp_sohash.patch
 URL:		http://www.zytor.com/mailman/listinfo/klibc/
-%{?with_dist_kernel:BuildRequires:	kernel-headers >= 2.4}
 BuildRequires:	bison
 BuildRequires:	flex
+BuildRequires:	linux-libc-headers >= 7:2.6.20
 BuildRequires:	rpmbuild(macros) >= 1.153
 BuildRequires:	perl-base
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,7 +42,7 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	binutils
-%{?with_dist_kernel:Requires:	kernel-headers >= 2.4}
+Requires:	linux-libc-headers >= 7:2.6.20
 
 %description devel
 Small libc for building embedded applications - development files.
@@ -92,33 +91,18 @@
 %patch1 -p1
 
 %build
-ln -s %{_kernelsrcdir} linux
-rm -rf usr/include/{asm,asm-generic,linux}
-%ifarch ppc powerpc
-if [ -d %{_kernelsrcdir}/include/asm-powerpc ]; then
-	install -d usr/include/asm
-	cp -a %{_kernelsrcdir}/include/asm-ppc/* usr/include/asm/
-	cp -a %{_kernelsrcdir}/include/asm-powerpc/* usr/include/asm/
-else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} usr/include/asm
-fi
-%else
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} usr/include/asm
-%endif
 cd usr/include
-ln -sf %{_kernelsrcdir}/include/asm-generic .
-ln -sf %{_kernelsrcdir}/include/linux .
-%if %{with dist_kernel}
-[ ! -d arch/%{_target_base_arch}/linux ] && mkdir arch/%{_target_base_arch}/linux
-ln -sf  %{_kernelsrcdir}/include/linux/autoconf.h arch/%{_target_base_arch}/linux/autoconf.h
-%endif
-for a in `ls arch`; do [ "$a" != "%{_target_base_arch}" ] && rm -rf arch/$a; done
+ln -sf /usr/include/asm-generic .
+ln -sf /usr/include/asm .
+ln -sf /usr/include/linux .
 cd ../..
+install -d linux
+ln -sf ../usr/include linux/include
 
-%ifarch sparc
+%ifarch sparc sparcv9
 # hack; missing dependency in make system
-( cd usr/klibc && %{__make} -f arch/sparc/Makefile.inc ARCH=sparc \
-        arch/sparc/sdiv.S arch/sparc/udiv.S arch/sparc/srem.S arch/sparc/urem.S )
+%{__make} -C usr/klibc -f arch/sparc/Makefile.inc ARCH=sparc \
+        arch/sparc/sdiv.S arch/sparc/udiv.S arch/sparc/srem.S arch/sparc/urem.S
 %endif
 
 %{__make} \
@@ -188,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2007/09/07 21:55:26  qboosh
+- use linux-libc-headers
+
 Revision 1.65  2007/09/07 13:57:30  kosmo
 - updated to 1.5 (stable)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/klibc.spec?r1=1.65&r2=1.66&f=u