- updated to 0.116

[packages/klibc.git] / klibc.spec

diff --git a/klibc.spec b/klibc.spec
index 29a61068e8202fd945e21afe3e164aa4e633ef1e..46a4e4619f5ec5e261c9d386cd301207bada694a 100644 (file)
--- a/klibc.spec
+++ b/klibc.spec
@@ -1,16 +1,22 @@
+#
+# Conditional build:
+%bcond_without dist_kernel     # build without distribution kernel-headers
+#
 Summary:       Minimalistic libc subset for use with initramfs
-Summary(pl):   Zminimalizowany podzbiór bibliteki C do u¿ywa z initramfs
+Summary(pl):   Zminimalizowany podzbiór biblioteki C do u¿ywania z initramfs
 Name:          klibc
-Version:       0.22
+Version:       0.116
 Release:       1
 License:       BSD
 Group:         Libraries
 Source0:       ftp://ftp.kernel.org/pub/linux/libs/klibc/%{name}-%{version}.tar.bz2
-BuildRequires: kernel-source >= 2.4
-BuildRequires: perl
+# Source0-md5: c375d6c279d22c33cddabc2b04458b4a
+URL:           http://www.zytor.com/mailman/listinfo/klibc/
+%{?with_dist_kernel:BuildRequires:     kernel-headers >= 2.4}
+BuildRequires: perl-base
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define no_install_post_strip 1
+%define                no_install_post_strip   1
 
 %description
 klibc, what is intended to be a minimalistic libc subset for use with
@@ -20,8 +26,8 @@ progress, and a lot of things are still missing.
 
 %description -l pl
 klibc w zamierzeniu ma byæ minimalistycznym podzbiorem biblioteki libc
-do u¿ycia z initramfs. Celem jest minimalizacja, przenaszalno¶æ ale
-nie szybko¶æ. klibc jest rozwijan± bibliotek± w zwi±zku z czym nadal
+do u¿ycia z initramfs. Celem jest minimalizacja, przeno¶no¶æ ale nie
+szybko¶æ. klibc jest rozwijan± bibliotek± w zwi±zku z czym nadal
 brakuje wielu rzeczy.
 
 %prep
@@ -30,21 +36,8 @@ brakuje wielu rzeczy.
 %build
 ln -s %{_kernelsrcdir} linux
 
-# 32 bit archs
-%ifarch %{ix86} sparc sparc32 ppc
-ln -sf bits32 include/bitsize
-%endif
-# 64 bit archs
-%ifarch alpha sparc64 ppc64
-ln -sf bits64 include/bitsize
-%endif
-
 %{__make} \
-%ifarch %{ix86}
-       ARCH=i386 \
-%else
-       ARCH=%{_target_cpu} \
-%endif
+       CC=%{__cc} \
        OPTFLAGS="%{rpmcflags} -Os -fomit-frame-pointer -falign-functions=0 \
                -falign-jumps=0 -falign-loops=0"
 
@@ -53,15 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/klibc
 install -d $RPM_BUILD_ROOT%{_libdir}/klibc
 
-cp -a include/* $RPM_BUILD_ROOT%{_includedir}/klibc
-install libc.* crt0.o  $RPM_BUILD_ROOT%{_libdir}/klibc
+cp -a klibc/include/* $RPM_BUILD_ROOT%{_includedir}/klibc
+install klibc/libc.* klibc/crt0.o      $RPM_BUILD_ROOT%{_libdir}/klibc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_includedir}/klibc
 %dir %{_libdir}/klibc
-%{_libdir}/klibc/*.[ao]
 %attr(755,root,root) %{_libdir}/klibc/*.so
+%{_libdir}/klibc/*.[ao]
+%{_includedir}/klibc